From 0ec342605b23f36aa6510087525889c2f6eb6588 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 12:55:47 +0000 Subject: Bug #212509 - Implement a new --without-mask option that causes repoman to behave as if there are no package.mask entries. (trunk r9520) svn path=/main/branches/2.1.2/; revision=9573 --- bin/repoman | 3 +++ man/repoman.1 | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/repoman b/bin/repoman index f927fc221..18f4d7267 100755 --- a/bin/repoman +++ b/bin/repoman @@ -127,6 +127,7 @@ 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", "--xmlparse" : "Forces the metadata.xml parse check to be carried out" } repoman_shortoptions={ @@ -1794,6 +1795,8 @@ for x in scanlist: config_profile_path=profdir, config_incrementals=portage_const.INCREMENTALS, local_config=False) + if "--without-mask" in myoptions: + dep_settings.pmaskdict.clear() arch_caches[prof[0]] = dep_settings while True: try: diff --git a/man/repoman.1 b/man/repoman.1 index f213b9adf..be0150aa1 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 -- cgit v1.2.3-1-g7c22