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

(trunk r9619)

svn path=/main/branches/2.1.2/; revision=9620

diff --git a/bin/repoman b/bin/repoman
index d9645c25855847caafa7021d086f8d73dabc6d10..298614b8f3380cfa352b88e7b9152d6a657ffa57 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -127,7 +127,8 @@ repoman_options={
 "--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 @@ if ("--version" in myoptions):
        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

diff --git a/man/repoman.1 b/man/repoman.1
index a34af698643492f99c6e59756bd413173720af07..e7b06a6dafc3d571d1013dc0d93d8488821605ee 100644 (file)
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -41,7 +41,7 @@ Ignore arch-specific failures (where arch != host)
 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