| 1 |
solar 07/10/28 21:22:18 |
| 2 |
|
| 3 |
Modified: main.c |
| 4 |
Log: |
| 5 |
- fix up slotting support a little. raised default warn time about slow file systems so fanboys shutup |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.148 portage-utils/main.c |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?rev=1.148&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?rev=1.148&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/main.c?r1=1.147&r2=1.148 |
| 13 |
|
| 14 |
Index: main.c |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v |
| 17 |
retrieving revision 1.147 |
| 18 |
retrieving revision 1.148 |
| 19 |
diff -u -r1.147 -r1.148 |
| 20 |
--- main.c 30 May 2007 23:17:24 -0000 1.147 |
| 21 |
+++ main.c 28 Oct 2007 21:22:17 -0000 1.148 |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
/* |
| 24 |
* Copyright 2005-2007 Gentoo Foundation |
| 25 |
* Distributed under the terms of the GNU General Public License v2 |
| 26 |
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.147 2007/05/30 23:17:24 solar Exp $ |
| 27 |
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.148 2007/10/28 21:22:17 solar Exp $ |
| 28 |
* |
| 29 |
* Copyright 2005-2007 Ned Ludd - <solar@g.o> |
| 30 |
* Copyright 2005-2007 Mike Frysinger - <vapier@g.o> |
| 31 |
@@ -685,7 +685,7 @@ |
| 32 |
if (frac < 0) frac = 0; |
| 33 |
|
| 34 |
warn("Finished %u entries in %d.%06d seconds", count, secs, frac); |
| 35 |
- if (secs > 100) |
| 36 |
+ if (secs > 120) |
| 37 |
#ifdef __linux__ |
| 38 |
warn("You should consider a faster file system such as reiserfs for PORTDIR='%s'", portdir); |
| 39 |
#else |
| 40 |
@@ -908,6 +908,7 @@ |
| 41 |
int dfd, i; |
| 42 |
|
| 43 |
char buf[_Q_PATH_MAX]; |
| 44 |
+ char slot[_Q_PATH_MAX]; |
| 45 |
static char savecwd[_POSIX_PATH_MAX]; |
| 46 |
|
| 47 |
struct dirent **cat; |
| 48 |
@@ -947,11 +948,14 @@ |
| 49 |
if ((atom = atom_explode(buf)) == NULL) |
| 50 |
continue; |
| 51 |
|
| 52 |
+ slot[0] = '0'; |
| 53 |
+ slot[1] = 0; |
| 54 |
strncat(buf, "/SLOT", sizeof(buf)); |
| 55 |
if (access(buf, R_OK) == 0) { |
| 56 |
eat_file(buf, buf, sizeof(buf)); |
| 57 |
rmspace(buf); |
| 58 |
- if (strcmp(buf, "0") != 0); |
| 59 |
+ if (strcmp(buf, "0") != 0) |
| 60 |
+ strncpy(slot, buf, sizeof(slot)); |
| 61 |
} |
| 62 |
|
| 63 |
if (fullcpv) { |
| 64 |
@@ -962,9 +966,8 @@ |
| 65 |
} else { |
| 66 |
snprintf(buf, sizeof(buf), "%s/%s", atom->CATEGORY, atom->PN); |
| 67 |
} |
| 68 |
- |
| 69 |
atom_implode(atom); |
| 70 |
- cpf = add_set(buf, "0", cpf); |
| 71 |
+ cpf = add_set(buf, slot, cpf); |
| 72 |
} |
| 73 |
chdir(".."); |
| 74 |
while (dfd--) free(pf[dfd]); |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
-- |
| 79 |
gentoo-commits@g.o mailing list |
Archives