Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15240 - in main/branches/2.1.7: bin man
Date: Fri, 29 Jan 2010 18:46:26
Message-Id: E1NavrM-0006G6-Ly@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-29 18:46:24 +0000 (Fri, 29 Jan 2010)
3 New Revision: 15240
4
5 Modified:
6 main/branches/2.1.7/bin/repoman
7 main/branches/2.1.7/man/repoman.1
8 Log:
9 Bug #269225 - Warn about virtuals with non-empty HOMEPAGE or LICENSE. Thanks
10 to Ulrich M?\195?\188ller <ulm@g.o> for this patch. (trunk r15174)
11
12 Modified: main/branches/2.1.7/bin/repoman
13 ===================================================================
14 --- main/branches/2.1.7/bin/repoman 2010-01-29 18:46:10 UTC (rev 15239)
15 +++ main/branches/2.1.7/bin/repoman 2010-01-29 18:46:24 UTC (rev 15240)
16 @@ -278,6 +278,7 @@
17 "KEYWORDS.stable":"Ebuilds that have been added directly with stable KEYWORDS",
18 "KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask",
19 "LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable",
20 + "LICENSE.virtual":"Virtuals that have a non-empty LICENSE variable",
21 "DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable",
22 "DESCRIPTION.toolong":"DESCRIPTION is over %d characters" % max_desc_len,
23 "EAPI.definition":"EAPI is defined after an inherit call (must be defined before)",
24 @@ -285,6 +286,7 @@
25 "EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)",
26 "SLOT.invalid":"Ebuilds that have a missing or invalid SLOT variable value",
27 "HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable",
28 + "HOMEPAGE.virtual":"Virtuals that have a non-empty HOMEPAGE variable",
29 "DEPEND.bad":"User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)",
30 "RDEPEND.bad":"User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds)",
31 "PDEPEND.bad":"User-visible ebuilds with bad PDEPEND settings (matched against *visible* ebuilds)",
32 @@ -360,6 +362,8 @@
33 "DEPEND.badmaskedindev","RDEPEND.badmaskedindev","PDEPEND.badmaskedindev",
34 "DEPEND.badtilde", "RDEPEND.badtilde", "PDEPEND.badtilde",
35 "DESCRIPTION.toolong",
36 +"HOMEPAGE.virtual",
37 +"LICENSE.virtual",
38 "KEYWORDS.dropped",
39 "KEYWORDS.stupid",
40 "KEYWORDS.missing",
41 @@ -1381,6 +1385,13 @@
42 stats[myqakey]=stats[myqakey]+1
43 fails[myqakey].append(x+"/"+y+".ebuild")
44
45 + if catdir == "virtual":
46 + for var in ("HOMEPAGE", "LICENSE"):
47 + if myaux.get(var):
48 + myqakey = var + ".virtual"
49 + stats[myqakey] = stats[myqakey] + 1
50 + fails[myqakey].append(relative_path)
51 +
52 # 14 is the length of DESCRIPTION=""
53 if len(myaux['DESCRIPTION']) > max_desc_len:
54 stats['DESCRIPTION.toolong'] += 1
55
56 Modified: main/branches/2.1.7/man/repoman.1
57 ===================================================================
58 --- main/branches/2.1.7/man/repoman.1 2010-01-29 18:46:10 UTC (rev 15239)
59 +++ main/branches/2.1.7/man/repoman.1 2010-01-29 18:46:24 UTC (rev 15240)
60 @@ -119,6 +119,9 @@
61 .B HOMEPAGE.missing
62 Ebuilds that have a missing or empty HOMEPAGE variable
63 .TP
64 +.B HOMEPAGE.virtual
65 +Virtuals that have a non-empty HOMEPAGE variable
66 +.TP
67 .B IUSE.invalid
68 This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file
69 .TP
70 @@ -149,6 +152,9 @@
71 .B LICENSE.syntax
72 Syntax error in LICENSE (usually an extra/missing space/parenthesis)
73 .TP
74 +.B LICENSE.virtual
75 +Virtuals that have a non-empty LICENSE variable
76 +.TP
77 .B LIVEVCS.stable
78 Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keywords.
79 .TP