diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-03-30 05:40:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-30 05:40:14 +0000 |
| commit | 8622eb84d84a666d3a541f0b1fcd39f7b0b2da24 (patch) | |
| tree | e3bbb7fe69cbdfec83ff083b93720716add7e917 | |
| parent | Make code a bit less prone to potentially hidden TypeError like bugs. (diff) | |
| download | portage-multirepo-8622eb84d84a666d3a541f0b1fcd39f7b0b2da24.tar.gz portage-multirepo-8622eb84d84a666d3a541f0b1fcd39f7b0b2da24.tar.bz2 portage-multirepo-8622eb84d84a666d3a541f0b1fcd39f7b0b2da24.zip | |
Do not allow commit mode together with the --without-mask options.
svn path=/main/trunk/; revision=9619
| -rwxr-xr-x | bin/repoman | 9 | ||||
| -rw-r--r-- | man/repoman.1 | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/repoman b/bin/repoman index 4b6d4b52..c5983662 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): diff --git a/man/repoman.1 b/man/repoman.1 index b8ab6d9b..1beb1306 100644 --- 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 |