From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Mar 2008 22:03:54 +0000 (-0000)
Subject: Bug #212509 - Display a note about the --without-mask option when there
X-Git-Tag: v2.2_pre6~324
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b03aa476c7b6761084700e5837ef513e35c4db5;p=portage.git

Bug #212509 - Display a note about the --without-mask option when there
are masked packages.

svn path=/main/trunk/; revision=9521
---

diff --git a/bin/repoman b/bin/repoman
index c4fa7ba32..4ed1a34b7 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -185,7 +185,7 @@ def ParseArgs(args, qahelp):
 	parser.add_option('-i', '--ignore-arches', dest='ignore_arches', action='store_true',
 		default=False, help='ignore arch-specific failures (where arch != host)')
 
-	parser.add_option('-I', '--ignored-masked', dest='ignore_masked', action='store_true',
+	parser.add_option('-I', '--ignore-masked', dest='ignore_masked', action='store_true',
 		default=False, help='ignore masked packages (not allowed with commit mode)')
 
 	parser.add_option('--without-mask', dest='without_mask', action='store_true',
@@ -696,6 +696,7 @@ if isCvs:
 	new_ebuilds.update(x for x in mynew if x.endswith(".ebuild"))
 	del mycvstree, mynew
 
+have_masked = False
 dofail = 0
 arch_caches={}
 arch_xmatch_caches = {}
@@ -1284,6 +1285,7 @@ for x in scanlist:
 					ismasked = os.path.join(catdir, y) not in \
 						portdb.xmatch("list-visible", x)
 					if ismasked:
+						have_masked = True
 						if options.ignore_masked:
 							continue
 						#we are testing deps for a masked package; give it some lee-way
@@ -1409,6 +1411,10 @@ 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):
+	print bold("Note: use --without-mask to check " + \
+		"KEYWORDS on dependencies of masked packages")
+
 if options.mode != 'commit':
 	if dofull:
 		print bold("Note: type \"repoman full\" for a complete listing.")