diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-30 05:52:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-30 05:52:04 +0000 |
| commit | b0e56e905476fdd79231b9bcce64842ba53a4394 (patch) | |
| tree | a2f8b03407c96fbac85df60d360f0f5b26351918 | |
| parent | 9e9457405c690bf26f4e884f3b47c06ea17cab8f (diff) | |
| download | portage-b0e56e905476fdd79231b9bcce64842ba53a4394.tar.gz portage-b0e56e905476fdd79231b9bcce64842ba53a4394.tar.bz2 portage-b0e56e905476fdd79231b9bcce64842ba53a4394.zip | |
Do not allow commit mode together with the --without-mask options.
(trunk r9619)
svn path=/main/branches/2.1.2/; revision=9620
| -rwxr-xr-x | bin/repoman | 7 | ||||
| -rw-r--r-- | man/repoman.1 | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman index d9645c258..298614b8f 100755 --- 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 a34af6986..e7b06a6da 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 |