| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 05:40:14 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9619 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
main/trunk/man/repoman.1 |
| 8 |
Log: |
| 9 |
Do not allow commit mode together with the --without-mask options. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/repoman |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/repoman 2008-03-30 04:58:21 UTC (rev 9618) |
| 15 |
+++ main/trunk/bin/repoman 2008-03-30 05:40:14 UTC (rev 9619) |
| 16 |
@@ -189,7 +189,7 @@ |
| 17 |
default=False, help='ignore masked packages (not allowed with commit mode)') |
| 18 |
|
| 19 |
parser.add_option('--without-mask', dest='without_mask', action='store_true', |
| 20 |
- default=False, help='behave as if no package.mask entries exist') |
| 21 |
+ default=False, help='behave as if no package.mask entries exist (not allowed with commit mode)') |
| 22 |
|
| 23 |
parser.add_option('--mode', type='choice', dest='mode', choices=modes.keys(), |
| 24 |
help='specify which mode repoman will run in (default=full)') |
| 25 |
@@ -222,8 +222,11 @@ |
| 26 |
if not opts.mode: |
| 27 |
opts.mode = 'full' #default to full |
| 28 |
|
| 29 |
- if opts.mode == 'commit' and opts.ignore_masked: |
| 30 |
- parser.error('Commit mode and --ignore_masked are not compatable') |
| 31 |
+ if opts.mode == 'commit' and not (opts.force or opts.pretend): |
| 32 |
+ if opts.ignore_masked: |
| 33 |
+ parser.error('Commit mode and --ignore-masked are not compatable') |
| 34 |
+ if opts.without_mask: |
| 35 |
+ parser.error('Commit mode and --without-mask are not compatable') |
| 36 |
|
| 37 |
# Use the verbosity and quiet options to fiddle with the loglevel appropriately |
| 38 |
for val in range(opts.verbosity): |
| 39 |
|
| 40 |
Modified: main/trunk/man/repoman.1 |
| 41 |
=================================================================== |
| 42 |
--- main/trunk/man/repoman.1 2008-03-30 04:58:21 UTC (rev 9618) |
| 43 |
+++ main/trunk/man/repoman.1 2008-03-30 05:40:14 UTC (rev 9619) |
| 44 |
@@ -41,7 +41,7 @@ |
| 45 |
Ignore masked packages (not allowed with commit mode) |
| 46 |
.TP |
| 47 |
\fB\-\-without\-mask\fR |
| 48 |
-Behave as if no package.mask entries exist |
| 49 |
+Behave as if no package.mask entries exist (not allowed with commit mode) |
| 50 |
.TP |
| 51 |
\fB-m\fR, \fB--commitmsg\fR |
| 52 |
Adds a commit message via the command line |
| 53 |
|
| 54 |
-- |
| 55 |
gentoo-commits@l.g.o mailing list |
Archives