Bug #227225 - Add *DEPEND.badtilde warning for ~ operator used with non-zero

revision. Thanks to David Leverton <levertond@googlemail.com> for this patch.

svn path=/main/trunk/; revision=14629

2 files changed, 21 insertions, 0 deletions

diff --git a/bin/repoman b/bin/repoman
index c764aed7f..bfd136698 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -295,6 +295,9 @@ qahelp={
 	"DEPEND.syntax":"Syntax error in DEPEND (usually an extra/missing space/parenthesis)",
 	"RDEPEND.syntax":"Syntax error in RDEPEND (usually an extra/missing space/parenthesis)",
 	"PDEPEND.syntax":"Syntax error in PDEPEND (usually an extra/missing space/parenthesis)",
+	"DEPEND.badtilde":"DEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)",
+	"RDEPEND.badtilde":"RDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)",
+	"PDEPEND.badtilde":"PDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)",
 	"LICENSE.syntax":"Syntax error in LICENSE (usually an extra/missing space/parenthesis)",
 	"PROVIDE.syntax":"Syntax error in PROVIDE (usually an extra/missing space/parenthesis)",
 	"PROPERTIES.syntax":"Syntax error in PROPERTIES (usually an extra/missing space/parenthesis)",
@@ -349,6 +352,7 @@ qawarnings = set((
 "DEPEND.badmasked","RDEPEND.badmasked","PDEPEND.badmasked",
 "DEPEND.badindev","RDEPEND.badindev","PDEPEND.badindev",
 "DEPEND.badmaskedindev","RDEPEND.badmaskedindev","PDEPEND.badmaskedindev",
+"DEPEND.badtilde", "RDEPEND.badtilde", "PDEPEND.badtilde",
 "DESCRIPTION.toolong",
 "KEYWORDS.dropped",
 "KEYWORDS.stupid",
@@ -1502,6 +1506,14 @@ for x in scanlist:
 								" not supported with EAPI='%s':" + \
 								" '%s'") % (mytype, eapi, atom))
 
+						if atom.operator == "~" and \
+							portage.versions.catpkgsplit(atom.cpv)[3] != "r0":
+							stats[mytype + '.badtilde'] += 1
+							fails[mytype + '.badtilde'].append(
+								(relative_path + ": %s uses the ~ operator"
+								 " with a non-zero revision:" + \
+								 " '%s'") % (mytype, atom))
+
 			type_list.extend([mytype] * (len(badsyntax) - len(type_list)))
 
 		for m,b in zip(type_list, badsyntax):
diff --git a/man/repoman.1 b/man/repoman.1
index dbb214d31..5fa1bdf8e 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -98,6 +98,9 @@ Masked ebuilds with bad DEPEND settings (matched against *all* ebuilds)
 .B DEPEND.badmaskedindev
 Masked ebuilds with bad DEPEND settings (matched against *all* ebuilds) in developing arch
 .TP
+.B DEPEND.badtilde
+DEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
+.TP
 .B DEPEND.syntax
 Syntax error in DEPEND (usually an extra/missing space/parenthesis)
 .TP
@@ -165,6 +168,9 @@ Masked ebuilds with PDEPEND settings (matched against *all* ebuilds)
 .B PDEPEND.badmaskedindev
 Masked ebuilds with PDEPEND settings (matched against *all* ebuilds) in developing arch
 .TP
+.B PDEPEND.badtilde
+PDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
+.TP
 .B PDEPEND.suspect
 PDEPEND contains a package that usually only belongs in DEPEND
 .TP
@@ -186,6 +192,9 @@ Masked ebuilds with RDEPEND settings (matched against *all* ebuilds)
 .B RDEPEND.badmaskedindev
 Masked ebuilds with RDEPEND settings (matched against *all* ebuilds) in developing arch
 .TP
+.B RDEPEND.badtilde
+RDEPEND uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)
+.TP
 .B RDEPEND.suspect
 RDEPEND contains a package that usually only belongs in DEPEND
 .TP