[gentoo-commits] portage r9619 - in main/trunk: bin man

[gentoo-commits] portage r9619 - in main/trunk: bin man

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 05:40:14 +0000 (Sun, 30 Mar 2008)
New Revision: 9619

Modified:
   main/trunk/bin/repoman
   main/trunk/man/repoman.1
Log:
Do not allow commit mode together with the --without-mask options.


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2008-03-30 04:58:21 UTC (rev 9618)
+++ main/trunk/bin/repoman	2008-03-30 05:40:14 UTC (rev 9619)
@@ -189,7 +189,7 @@
 		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 @@
 	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):

Modified: main/trunk/man/repoman.1
===================================================================
--- main/trunk/man/repoman.1	2008-03-30 04:58:21 UTC (rev 9618)
+++ main/trunk/man/repoman.1	2008-03-30 05:40:14 UTC (rev 9619)
@@ -41,7 +41,7 @@
 Ignore masked packages (not allowed with commit mode)
 .TP
 \fB\-\-without\-mask\fR
-Behave as if no package.mask entries exist
+Behave as if no package.mask entries exist (not allowed with commit mode)
 .TP
 \fB-m\fR, \fB--commitmsg\fR
 Adds a commit message via the command line

-- 
gentoo-commits@lists.gentoo.org mailing list