summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-27 21:39:14 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-27 21:39:14 +0000
commit91cae42bc7f7038acd5d301a51e5b4b6710e21c1 (patch)
tree768746ba38abf89bcbbaa594fb592939d69f3dc3
parent37ff5f15b700a9ad4475e1a9e3e212814d5fb88d (diff)
downloadportage-91cae42bc7f7038acd5d301a51e5b4b6710e21c1.tar.gz
portage-91cae42bc7f7038acd5d301a51e5b4b6710e21c1.tar.bz2
portage-91cae42bc7f7038acd5d301a51e5b4b6710e21c1.zip
Bug #212509 - Implement a new --without-mask option that causes repoman to
behave as if there are no package.mask entries. svn path=/main/trunk/; revision=9520
-rwxr-xr-xbin/repoman7
-rw-r--r--man/repoman.18
2 files changed, 13 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 165c66c00..c4fa7ba32 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -186,7 +186,10 @@ def ParseArgs(args, qahelp):
default=False, help='ignore arch-specific failures (where arch != host)')
parser.add_option('-I', '--ignored-masked', dest='ignore_masked', action='store_true',
- default=False, help='ignore masked packages (not allowed with commit mode')
+ 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')
parser.add_option('--mode', type='choice', dest='mode', choices=modes.keys(),
help='specify which mode repoman will run in (default=full)')
@@ -1242,6 +1245,8 @@ for x in scanlist:
config_profile_path=profdir,
config_incrementals=portage.const.INCREMENTALS,
local_config=False)
+ if options.without_mask:
+ dep_settings.pmaskdict.clear()
arch_caches[prof[0]] = dep_settings
while True:
try:
diff --git a/man/repoman.1 b/man/repoman.1
index 037f5db2e..6a0f43878 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -34,9 +34,15 @@ Forces the metadata.xml parse check to be carried out
\fB-v\fR, \fB--verbose\fR
Displays every package name while checking
.TP
-\fB-I\fR, \fB--ignore-arches\fR
+\fB\-i\fR, \fB\-\-ignore\-arches\fR
Ignore arch-specific failures (where arch != host)
.TP
+\fB\-I\fR, \fB\-\-ignore\-masked\fR
+Ignore masked packages (not allowed with commit mode)
+.TP
+\fB\-\-without\-mask\fR
+Behave as if no package.mask entries exist
+.TP
\fB-m\fR, \fB--commitmsg\fR
Adds a commit message via the command line
.TP