| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 05:52:04 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9620 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/repoman |
| 7 |
main/branches/2.1.2/man/repoman.1 |
| 8 |
Log: |
| 9 |
Do not allow commit mode together with the --without-mask options. |
| 10 |
(trunk r9619) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/repoman |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/repoman 2008-03-30 05:40:14 UTC (rev 9619) |
| 16 |
+++ main/branches/2.1.2/bin/repoman 2008-03-30 05:52:04 UTC (rev 9620) |
| 17 |
@@ -127,7 +127,8 @@ |
| 18 |
"--quiet" : "Be less verbose about extraneous info", |
| 19 |
"--verbose" : "Displays every package name while checking", |
| 20 |
"--version" : "Show version info", |
| 21 |
-"--without-mask" : "Behave as if no package.mask entries exist", |
| 22 |
+"--without-mask" : "Behave as if no package.mask entries exist (not " + \ |
| 23 |
+ "allowed\n with commit mode)", |
| 24 |
"--xmlparse" : "Forces the metadata.xml parse check to be carried out" |
| 25 |
} |
| 26 |
repoman_shortoptions={ |
| 27 |
@@ -563,8 +564,10 @@ |
| 28 |
show_version() |
| 29 |
if mymode=="last" or (mymode=="lfull"): |
| 30 |
last() |
| 31 |
-if mymode == "commit": |
| 32 |
+if mymode == "commit" and \ |
| 33 |
+ not ("--force" in myoptions or "--pretend" in myoptions): |
| 34 |
myoptions.pop("--ignore-masked", None) |
| 35 |
+ myoptions.pop("--without-mask", None) |
| 36 |
|
| 37 |
# Set this to False when an extraordinary issue (generally |
| 38 |
# something other than a QA issue) makes it impossible to |
| 39 |
|
| 40 |
Modified: main/branches/2.1.2/man/repoman.1 |
| 41 |
=================================================================== |
| 42 |
--- main/branches/2.1.2/man/repoman.1 2008-03-30 05:40:14 UTC (rev 9619) |
| 43 |
+++ main/branches/2.1.2/man/repoman.1 2008-03-30 05:52:04 UTC (rev 9620) |
| 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