| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-27 22:03:54 +0000 (Thu, 27 Mar 2008) |
| 3 |
New Revision: 9521 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
Log: |
| 8 |
Bug #212509 - Display a note about the --without-mask option when there |
| 9 |
are masked packages. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/repoman |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/repoman 2008-03-27 21:39:14 UTC (rev 9520) |
| 15 |
+++ main/trunk/bin/repoman 2008-03-27 22:03:54 UTC (rev 9521) |
| 16 |
@@ -185,7 +185,7 @@ |
| 17 |
parser.add_option('-i', '--ignore-arches', dest='ignore_arches', action='store_true', |
| 18 |
default=False, help='ignore arch-specific failures (where arch != host)') |
| 19 |
|
| 20 |
- parser.add_option('-I', '--ignored-masked', dest='ignore_masked', action='store_true', |
| 21 |
+ parser.add_option('-I', '--ignore-masked', dest='ignore_masked', action='store_true', |
| 22 |
default=False, help='ignore masked packages (not allowed with commit mode)') |
| 23 |
|
| 24 |
parser.add_option('--without-mask', dest='without_mask', action='store_true', |
| 25 |
@@ -696,6 +696,7 @@ |
| 26 |
new_ebuilds.update(x for x in mynew if x.endswith(".ebuild")) |
| 27 |
del mycvstree, mynew |
| 28 |
|
| 29 |
+have_masked = False |
| 30 |
dofail = 0 |
| 31 |
arch_caches={} |
| 32 |
arch_xmatch_caches = {} |
| 33 |
@@ -1284,6 +1285,7 @@ |
| 34 |
ismasked = os.path.join(catdir, y) not in \ |
| 35 |
portdb.xmatch("list-visible", x) |
| 36 |
if ismasked: |
| 37 |
+ have_masked = True |
| 38 |
if options.ignore_masked: |
| 39 |
continue |
| 40 |
#we are testing deps for a masked package; give it some lee-way |
| 41 |
@@ -1409,6 +1411,10 @@ |
| 42 |
mygroups[xs[0]]+=[seperator.join(xs[1:])] |
| 43 |
return mygroups |
| 44 |
|
| 45 |
+if have_masked and not (options.without_mask or options.ignore_masked): |
| 46 |
+ print bold("Note: use --without-mask to check " + \ |
| 47 |
+ "KEYWORDS on dependencies of masked packages") |
| 48 |
+ |
| 49 |
if options.mode != 'commit': |
| 50 |
if dofull: |
| 51 |
print bold("Note: type \"repoman full\" for a complete listing.") |
| 52 |
|
| 53 |
-- |
| 54 |
gentoo-commits@l.g.o mailing list |
Archives