| 1 |
Unify the -d option to take y|n argument alike -e. This is necessary |
| 2 |
to make it possible to control its value after changing the default. |
| 3 |
Also rename the long option and its uses to match the full name for -e. |
| 4 |
--- |
| 5 |
repoman/pym/repoman/actions.py | 12 ++++++------ |
| 6 |
repoman/pym/repoman/argparser.py | 4 ++-- |
| 7 |
repoman/pym/repoman/modules/scan/depend/profile.py | 2 +- |
| 8 |
repoman/pym/repoman/tests/simple/test_simple.py | 2 +- |
| 9 |
4 files changed, 10 insertions(+), 10 deletions(-) |
| 10 |
|
| 11 |
diff --git a/repoman/pym/repoman/actions.py b/repoman/pym/repoman/actions.py |
| 12 |
index 8e23322c8..3e9fe97d5 100644 |
| 13 |
--- a/repoman/pym/repoman/actions.py |
| 14 |
+++ b/repoman/pym/repoman/actions.py |
| 15 |
@@ -51,17 +51,17 @@ class Actions(object): |
| 16 |
self.repoman_settings = repo_settings.repoman_settings |
| 17 |
self.suggest = { |
| 18 |
'ignore_masked': False, |
| 19 |
- 'include_dev': False, |
| 20 |
+ 'include_dev_profiles': False, |
| 21 |
} |
| 22 |
if scanner.have['pmasked'] and not (options.without_mask or options.ignore_masked): |
| 23 |
self.suggest['ignore_masked'] = True |
| 24 |
- if scanner.have['dev_keywords'] and not options.include_dev: |
| 25 |
- self.suggest['include_dev'] = True |
| 26 |
+ if scanner.have['dev_keywords'] and not options.include_dev_profiles: |
| 27 |
+ self.suggest['include_dev_profiles'] = True |
| 28 |
|
| 29 |
|
| 30 |
def inform(self, can_force, result): |
| 31 |
'''Inform the user of all the problems found''' |
| 32 |
- if ((self.suggest['ignore_masked'] or self.suggest['include_dev']) |
| 33 |
+ if ((self.suggest['ignore_masked'] or self.suggest['include_dev_profiles']) |
| 34 |
and not self.options.quiet): |
| 35 |
self._suggest() |
| 36 |
if self.options.mode != 'commit': |
| 37 |
@@ -238,9 +238,9 @@ the whole commit message to abort. |
| 38 |
"Note: use --without-mask to check " |
| 39 |
"KEYWORDS on dependencies of masked packages")) |
| 40 |
|
| 41 |
- if self.suggest['include_dev']: |
| 42 |
+ if self.suggest['include_dev_profiles']: |
| 43 |
print(bold( |
| 44 |
- "Note: use --include-dev (-d) to check " |
| 45 |
+ "Note: use --include-dev-profiles=y (-d y) to check " |
| 46 |
"dependencies for 'dev' profiles")) |
| 47 |
print() |
| 48 |
|
| 49 |
diff --git a/repoman/pym/repoman/argparser.py b/repoman/pym/repoman/argparser.py |
| 50 |
index b7e6071ba..2e8aee1b6 100644 |
| 51 |
--- a/repoman/pym/repoman/argparser.py |
| 52 |
+++ b/repoman/pym/repoman/argparser.py |
| 53 |
@@ -161,8 +161,8 @@ def parse_args(argv, qahelp, repoman_default_opts): |
| 54 |
'filter the selection of profiles for dependency checks')) |
| 55 |
|
| 56 |
parser.add_argument( |
| 57 |
- '-d', '--include-dev', dest='include_dev', action='store_true', |
| 58 |
- default=False, |
| 59 |
+ '-d', '--include-dev-profiles', choices=('y', 'n'), metavar='<y|n>', |
| 60 |
+ default='n', |
| 61 |
help='include dev profiles in dependency checks') |
| 62 |
|
| 63 |
parser.add_argument( |
| 64 |
diff --git a/repoman/pym/repoman/modules/scan/depend/profile.py b/repoman/pym/repoman/modules/scan/depend/profile.py |
| 65 |
index 30d839af0..583a77e59 100644 |
| 66 |
--- a/repoman/pym/repoman/modules/scan/depend/profile.py |
| 67 |
+++ b/repoman/pym/repoman/modules/scan/depend/profile.py |
| 68 |
@@ -86,7 +86,7 @@ class ProfileDependsChecks(ScanBase): |
| 69 |
|
| 70 |
is_stable_profile = prof.status == "stable" |
| 71 |
is_dev_profile = prof.status == "dev" and \ |
| 72 |
- self.options.include_dev |
| 73 |
+ self.options.include_dev_profiles == 'y' |
| 74 |
is_exp_profile = prof.status == "exp" and \ |
| 75 |
self.options.include_exp_profiles == 'y' |
| 76 |
if not (is_stable_profile or is_dev_profile or is_exp_profile): |
| 77 |
diff --git a/repoman/pym/repoman/tests/simple/test_simple.py b/repoman/pym/repoman/tests/simple/test_simple.py |
| 78 |
index 3d7a70ad0..494152eca 100644 |
| 79 |
--- a/repoman/pym/repoman/tests/simple/test_simple.py |
| 80 |
+++ b/repoman/pym/repoman/tests/simple/test_simple.py |
| 81 |
@@ -191,7 +191,7 @@ class SimpleRepomanTestCase(TestCase): |
| 82 |
("", git_cmd + ("init-db",)), |
| 83 |
("", git_cmd + ("add", ".")), |
| 84 |
("", git_cmd + ("commit", "-a", "-m", "add whole repo")), |
| 85 |
- ("", repoman_cmd + ("full", "-d")), |
| 86 |
+ ("", repoman_cmd + ("full", "-d", "y")), |
| 87 |
("", cp_cmd + (test_ebuild, test_ebuild[:-8] + "2.ebuild")), |
| 88 |
("", git_cmd + ("add", test_ebuild[:-8] + "2.ebuild")), |
| 89 |
("", repoman_cmd + ("commit", "-m", "cat/pkg: bump to version 2")), |
| 90 |
-- |
| 91 |
2.16.2 |
Archives