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

diff --git a/bin/repoman b/bin/repoman
index 165c66c00d6267d2f88d4dd780c5e537689afa08..c4fa7ba32dab2c268ab1c21539030944f8f32cf2 100755 (executable)
--- 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 037f5db2e7709beb780aa7d82ecf5ef1f112ca16..6a0f4387855d16786177b5e2619c2c34edede855 100644 (file)
--- 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