[gentoo-commits] portage r9620 - in main/branches/2.1.2: bin man

[gentoo-commits] portage r9620 - in main/branches/2.1.2: bin man

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-30 05:52:04 +0000 (Sun, 30 Mar 2008)
New Revision: 9620

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


Modified: main/branches/2.1.2/bin/repoman
===================================================================
--- main/branches/2.1.2/bin/repoman	2008-03-30 05:40:14 UTC (rev 9619)
+++ main/branches/2.1.2/bin/repoman	2008-03-30 05:52:04 UTC (rev 9620)
@@ -127,7 +127,8 @@
 "--quiet"          : "Be less verbose about extraneous info",
 "--verbose"        : "Displays every package name while checking",
 "--version"        : "Show version info",
-"--without-mask"   : "Behave as if no package.mask entries exist",
+"--without-mask"   : "Behave as if no package.mask entries exist (not " + \
+						"allowed\n                      with commit mode)",
 "--xmlparse"       : "Forces the metadata.xml parse check to be carried out"
 }
 repoman_shortoptions={
@@ -563,8 +564,10 @@
 	show_version()
 if mymode=="last" or (mymode=="lfull"):
 	last()
-if mymode == "commit":
+if mymode == "commit" and \
+	not ("--force" in myoptions or "--pretend" in myoptions):
 	myoptions.pop("--ignore-masked", None)
+	myoptions.pop("--without-mask", None)
 
 # Set this to False when an extraordinary issue (generally
 # something other than a QA issue) makes it impossible to

Modified: main/branches/2.1.2/man/repoman.1
===================================================================
--- main/branches/2.1.2/man/repoman.1	2008-03-30 05:40:14 UTC (rev 9619)
+++ main/branches/2.1.2/man/repoman.1	2008-03-30 05:52:04 UTC (rev 9620)
@@ -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