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

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

diff --git a/bin/repoman b/bin/repoman
index 4b6d4b52d7943940dfe1fff6f75913b357cc2dbb..c598366299b0ea5cc13822e30c6a21c1d2f4435c 100755 (executable)
--- 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):

diff --git a/man/repoman.1 b/man/repoman.1
index b8ab6d9b2ffb2ca01cccceb7e9263e857ee15efe..1beb13065935385bc7c8e5b39870b43a6b2cc306 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