| 1 |
solar 09/08/23 06:06:49 |
| 2 |
|
| 3 |
Modified: qpkg.c |
| 4 |
Log: |
| 5 |
- old patch that needs pushing. I think it fixed the -rX problem with qpkg |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.27 portage-utils/qpkg.c |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qpkg.c?rev=1.27&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qpkg.c?rev=1.27&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qpkg.c?r1=1.26&r2=1.27 |
| 13 |
|
| 14 |
Index: qpkg.c |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v |
| 17 |
retrieving revision 1.26 |
| 18 |
retrieving revision 1.27 |
| 19 |
diff -u -r1.26 -r1.27 |
| 20 |
--- qpkg.c 4 Nov 2007 09:51:58 -0000 1.26 |
| 21 |
+++ qpkg.c 23 Aug 2009 06:06:49 -0000 1.27 |
| 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/qpkg.c,v 1.26 2007/11/04 09:51:58 solar Exp $ |
| 27 |
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.27 2009/08/23 06:06:49 solar Exp $ |
| 28 |
* |
| 29 |
* Copyright 2005-2007 Ned Ludd - <solar@g.o> |
| 30 |
* Copyright 2005-2007 Mike Frysinger - <vapier@g.o> |
| 31 |
@@ -24,7 +24,7 @@ |
| 32 |
"alternate package directory", |
| 33 |
COMMON_OPTS_HELP |
| 34 |
}; |
| 35 |
-static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.26 2007/11/04 09:51:58 solar Exp $"; |
| 36 |
+static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.27 2009/08/23 06:06:49 solar Exp $"; |
| 37 |
#define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg")) |
| 38 |
|
| 39 |
extern char pretend; |
| 40 |
@@ -206,11 +206,11 @@ |
| 41 |
struct stat st; |
| 42 |
|
| 43 |
if (pretend) { |
| 44 |
- printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->P); |
| 45 |
+ printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom_to_pvr(atom)); |
| 46 |
return 0; |
| 47 |
} |
| 48 |
|
| 49 |
- snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->P); |
| 50 |
+ snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom_to_pvr(atom)); |
| 51 |
if ((fp = fopen(buf, "r")) == NULL) |
| 52 |
return -1; |
| 53 |
|
| 54 |
@@ -245,7 +245,7 @@ |
| 55 |
fclose(out); |
| 56 |
fclose(fp); |
| 57 |
|
| 58 |
- printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->P); |
| 59 |
+ printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom_to_pvr(atom)); |
| 60 |
fflush(stdout); |
| 61 |
|
| 62 |
snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir); |
| 63 |
@@ -255,7 +255,7 @@ |
| 64 |
pclose(fp); |
| 65 |
|
| 66 |
snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir); |
| 67 |
- snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->P); |
| 68 |
+ snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom_to_pvr(atom)); |
| 69 |
xpak_argv[0] = buf; |
| 70 |
xpak_argv[1] = NULL; |
| 71 |
xpak_create(xpak, 1, xpak_argv); |
| 72 |
@@ -267,7 +267,7 @@ |
| 73 |
unlink(xpak); |
| 74 |
unlink(tbz2); |
| 75 |
|
| 76 |
- snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->P); |
| 77 |
+ snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom_to_pvr(atom)); |
| 78 |
if (rename(buf, tbz2)) { |
| 79 |
warnp("could not move '%s' to '%s'", buf, tbz2); |
| 80 |
return 1; |
Archives