summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-16 18:08:07 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-16 18:08:07 +0000
commit729c17c4a207f71d012ff367629a433c682d75c2 (patch)
treecc45337df42c5a0915a528dfd8f0ed0cbf3f95ce
parentb1f56d1bbd67c3d4318a7780b04a09c699e8cb8e (diff)
downloadportage-729c17c4a207f71d012ff367629a433c682d75c2.tar.gz
portage-729c17c4a207f71d012ff367629a433c682d75c2.tar.bz2
portage-729c17c4a207f71d012ff367629a433c682d75c2.zip
Only show the "--without-mask" suggestion when packages are actually masked
by package.mask (rather than just keywords). svn path=/main/trunk/; revision=11966
-rwxr-xr-xbin/repoman8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index a893acb99..a8f173c09 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -776,7 +776,7 @@ if vcs:
modified_changelogs.update(x for x in chain(mychanged, mynew) \
if os.path.basename(x) == "ChangeLog")
-have_masked = False
+have_pmasked = False
dofail = 0
arch_caches={}
arch_xmatch_caches = {}
@@ -1508,7 +1508,9 @@ for x in scanlist:
ismasked = os.path.join(catdir, y) not in \
portdb.xmatch("list-visible", x)
if ismasked:
- have_masked = True
+ if not have_pmasked:
+ have_pmasked = bool(dep_settings._getMaskAtom(
+ pkg.cpv, pkg.metadata))
if options.ignore_masked:
continue
#we are testing deps for a masked package; give it some lee-way
@@ -1634,7 +1636,7 @@ def grouplist(mylist,seperator="/"):
mygroups[xs[0]]+=[seperator.join(xs[1:])]
return mygroups
-if have_masked and not (options.without_mask or options.ignore_masked):
+if have_pmasked and not (options.without_mask or options.ignore_masked):
print bold("Note: use --without-mask to check " + \
"KEYWORDS on dependencies of masked packages")