From 10344709eeba075dc3954889f7f08e309bf33251 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 30 Aug 2011 20:04:17 -0700 Subject: repoman: enable dependency.unknown for blockers This will fix bug #381087. --- bin/repoman | 5 ++--- man/repoman.1 | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index d9ecfc469..6ec84e5e3 100755 --- a/bin/repoman +++ b/bin/repoman @@ -291,7 +291,7 @@ qahelp={ "ebuild.notadded":"Ebuilds that exist but have not been added to cvs", "ebuild.patches":"PATCHES variable should be a bash array to ensure white space safety", "changelog.notadded":"ChangeLogs that exist but have not been added to cvs", - "dependency.unknown" : "Ebuild has a dependency that refers to an unknown package (which may be provided by an overlay)", + "dependency.unknown" : "Ebuild has a dependency that refers to an unknown package (which may be valid if it is a blocker for a renamed/removed package, or is an alternative choice provided by an overlay)", "file.executable":"Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do note need the executable bit", "file.size":"Files in the files directory must be under 20 KiB", "file.size.fatal":"Files in the files directory must be under 60 KiB", @@ -1700,8 +1700,7 @@ for x in scanlist: if atom == "||": continue - if not atom.blocker and \ - not portdb.cp_list(atom.cp) and \ + if not portdb.cp_list(atom.cp) and \ not atom.cp.startswith("virtual/"): unknown_pkgs.setdefault(atom.cp, set()).add( (mytype, atom.unevaluated_atom)) diff --git a/man/repoman.1 b/man/repoman.1 index 8d06ae425..f0c9eff2f 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -252,7 +252,8 @@ ChangeLogs that exist but have not been added to cvs .TP .B dependency.unknown Ebuild has a dependency that refers to an unknown package (which may be -provided by an overlay) +valid if it is a blocker for a renamed/removed package, or is an +alternative choice provided by an overlay) .TP .B digest.assumed Existing digest must be assumed correct (Package level only) -- cgit v1.2.3-1-g7c22