diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-11-16 18:11:46 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-11-16 18:11:46 +0000 |
commit | 6b2f9a94a81d0096e0e12d5a2c4669a9f7d4d9c8 (patch) | |
tree | 100eaa5b38cb3f778142834b8c5187843a5d44a0 | |
parent | df1e1321ad669e29029225667f5875f62433c1ad (diff) | |
download | portage-6b2f9a94a81d0096e0e12d5a2c4669a9f7d4d9c8.tar.gz portage-6b2f9a94a81d0096e0e12d5a2c4669a9f7d4d9c8.tar.bz2 portage-6b2f9a94a81d0096e0e12d5a2c4669a9f7d4d9c8.zip |
Only show the "--without-mask" suggestion when packages are actually masked
by package.mask (rather than just keywords). (trunk r11966)
svn path=/main/branches/2.1.6/; revision=11967
-rwxr-xr-x | bin/repoman | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman index eea873de8..84170a1c5 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") |