Gentoo Archives: gentoo-commits

From: "Ned Ludd (solar)" <solar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in portage-utils: qmerge.c
Date: Sat, 21 Mar 2009 06:37:13
Message-Id: E1LkupS-00077m-Ls@stork.gentoo.org
1 solar 09/03/21 06:37:10
2
3 Modified: qmerge.c
4 Log:
5 - display the repo in verbose mode when it is not gentoo
6
7 Revision Changes Path
8 1.81 portage-utils/qmerge.c
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.81&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?rev=1.81&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/portage-utils/qmerge.c?r1=1.80&r2=1.81
13
14 Index: qmerge.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
17 retrieving revision 1.80
18 retrieving revision 1.81
19 diff -u -r1.80 -r1.81
20 --- qmerge.c 10 May 2008 20:21:12 -0000 1.80
21 +++ qmerge.c 21 Mar 2009 06:37:10 -0000 1.81
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/qmerge.c,v 1.80 2008/05/10 20:21:12 flameeyes Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.81 2009/03/21 06:37:10 solar Exp $
28 *
29 * Copyright 2005-2007 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2007 Mike Frysinger - <vapier@g.o>
31 @@ -55,7 +55,7 @@
32 COMMON_OPTS_HELP
33 };
34
35 -static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.80 2008/05/10 20:21:12 flameeyes Exp $";
36 +static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.81 2009/03/21 06:37:10 solar Exp $";
37 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
38
39 char search_pkgs = 0;
40 @@ -84,6 +84,7 @@
41 char SLOT[64];
42 size_t SIZE;
43 char USE[BUFSIZ];
44 + char REPO[64];
45 } Pkg;
46
47 struct llist_char_t {
48 @@ -1120,6 +1121,9 @@
49 printf(" %sRdepend%s:%s %s\n", DKGREEN, YELLOW, NORM, pkg->RDEPEND);
50 if (pkg->USE[0])
51 printf(" %sUse%s:%s %s\n", DKGREEN, YELLOW, NORM, pkg->USE);
52 + if (pkg->REPO[0])
53 + if (strcmp(pkg->REPO, "gentoo") != 0)
54 + printf(" %sRepo%s:%s %s\n", DKGREEN, YELLOW, NORM, pkg->REPO);
55
56 snprintf(buf, sizeof(buf), "%s/%s", pkg->CATEGORY, pkg->PF);
57 atom = atom_explode(buf);
58 @@ -1245,6 +1249,8 @@
59 strncpy(pkg->PF, value, sizeof(Pkg.PF));
60 if ((strcmp(buf, "CATEGORY:")) == 0)
61 strncpy(pkg->CATEGORY, value, sizeof(Pkg.CATEGORY));
62 + if ((strcmp(buf, "REPO:")) == 0)
63 + strncpy(pkg->REPO, value, sizeof(Pkg.REPO));
64
65 if ((strcmp(buf, "CPV:")) == 0) {
66 if ((atom = atom_explode(value)) != NULL) {
67 @@ -1423,6 +1429,7 @@
68 if ((strcmp(buf, "MD5:")) == 0) strncpy(Pkg.MD5, value, sizeof(Pkg.MD5));
69 break;
70 case 'R':
71 + if ((strcmp(buf, "REPO:")) == 0) strncpy(Pkg.REPO, value, sizeof(Pkg.REPO));
72 if ((strcmp(buf, "RDEPEND:")) == 0) strncpy(Pkg.RDEPEND, value, sizeof(Pkg.RDEPEND));
73 break;
74 case 'L':