Do not allow commit mode together with the --without-mask options.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/bin/repoman b/bin/repoman
index 4b6d4b52d..c59836629 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -189,7 +189,7 @@ def ParseArgs(args, qahelp):
 		default=False, help='ignore masked packages (not allowed with commit mode)')
 
 	parser.add_option('--without-mask', dest='without_mask', action='store_true',
-		default=False, help='behave as if no package.mask entries exist')
+		default=False, help='behave as if no package.mask entries exist (not allowed with commit mode)')
 
 	parser.add_option('--mode', type='choice', dest='mode', choices=modes.keys(), 
 		help='specify which mode repoman will run in (default=full)')
@@ -222,8 +222,11 @@ def ParseArgs(args, qahelp):
 	if not opts.mode:
 		opts.mode = 'full'	#default to full
 
-	if opts.mode == 'commit' and opts.ignore_masked:
-		parser.error('Commit mode and --ignore_masked are not compatable')
+	if opts.mode == 'commit' and not (opts.force or opts.pretend):
+		if opts.ignore_masked:
+			parser.error('Commit mode and --ignore-masked are not compatable')
+		if opts.without_mask:
+			parser.error('Commit mode and --without-mask are not compatable')
 
 	# Use the verbosity and quiet options to fiddle with the loglevel appropriately
 	for val in range(opts.verbosity):