Unify the -d option to take y|n argument alike -e. This is necessary
to make it possible to control its value after changing the default.
Also rename the long option and its uses to match the full name for -e.
---
repoman/pym/repoman/actions.py | 12 ++++++------
repoman/pym/repoman/argparser.py | 4 ++--
repoman/pym/repoman/modules/scan/depend/profile.py | 2 +-
repoman/pym/repoman/tests/simple/test_simple.py | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/repoman/pym/repoman/actions.py b/repoman/pym/repoman/actions.py
index 8e23322c8..3e9fe97d5 100644
--- a/repoman/pym/repoman/actions.py
+++ b/repoman/pym/repoman/actions.py
@@ -51,17 +51,17 @@ class Actions(object):
self.repoman_settings = repo_settings.repoman_settings
self.suggest = {
'ignore_masked': False,
- 'include_dev': False,
+ 'include_dev_profiles': False,
}
if scanner.have['pmasked'] and not (options.without_mask or
options.ignore_masked):
self.suggest['ignore_masked'] = True
- if scanner.have['dev_keywords'] and not options.include_dev:
- self.suggest['include_dev'] = True
+ if scanner.have['dev_keywords'] and not
options.include_dev_profiles:
+ self.suggest['include_dev_profiles'] = True
def inform(self, can_force, result):
'''Inform the user of all the problems found'''
- if ((self.suggest['ignore_masked'] or
self.suggest['include_dev'])
+ if ((self.suggest['ignore_masked'] or
self.suggest['include_dev_profiles'])
and not self.options.quiet):
self._suggest()
if self.options.mode != 'commit':
@@ -238,9 +238,9 @@ the whole commit message to abort.
"Note: use --without-mask to check "
"KEYWORDS on dependencies of masked packages"))
- if self.suggest['include_dev']:
+ if self.suggest['include_dev_profiles']:
print(bold(
- "Note: use --include-dev (-d) to check "
+ "Note: use --include-dev-profiles=y (-d y) to
check "
"dependencies for 'dev' profiles"))
print()
diff --git a/repoman/pym/repoman/argparser.py b/repoman/pym/repoman/argparser.py
index b7e6071ba..2e8aee1b6 100644
--- a/repoman/pym/repoman/argparser.py
+++ b/repoman/pym/repoman/argparser.py
@@ -161,8 +161,8 @@ def parse_args(argv, qahelp, repoman_default_opts):
'filter the selection of profiles for dependency
checks'))
parser.add_argument(
- '-d', '--include-dev', dest='include_dev', action='store_true',
- default=False,
+ '-d', '--include-dev-profiles', choices=('y', 'n'),
metavar='<y|n>',
+ default='n',
help='include dev profiles in dependency checks')
parser.add_argument(
diff --git a/repoman/pym/repoman/modules/scan/depend/profile.py
b/repoman/pym/repoman/modules/scan/depend/profile.py
index 30d839af0..583a77e59 100644
--- a/repoman/pym/repoman/modules/scan/depend/profile.py
+++ b/repoman/pym/repoman/modules/scan/depend/profile.py
@@ -86,7 +86,7 @@ class ProfileDependsChecks(ScanBase):
is_stable_profile = prof.status == "stable"
is_dev_profile = prof.status == "dev" and \
- self.options.include_dev
+ self.options.include_dev_profiles == 'y'
is_exp_profile = prof.status == "exp" and \
self.options.include_exp_profiles == 'y'
if not (is_stable_profile or is_dev_profile or
is_exp_profile):
diff --git a/repoman/pym/repoman/tests/simple/test_simple.py
b/repoman/pym/repoman/tests/simple/test_simple.py
index 3d7a70ad0..494152eca 100644
--- a/repoman/pym/repoman/tests/simple/test_simple.py
+++ b/repoman/pym/repoman/tests/simple/test_simple.py
@@ -191,7 +191,7 @@ class SimpleRepomanTestCase(TestCase):
("", git_cmd + ("init-db",)),
("", git_cmd + ("add", ".")),
("", git_cmd + ("commit", "-a", "-m", "add whole
repo")),
- ("", repoman_cmd + ("full", "-d")),
+ ("", repoman_cmd + ("full", "-d", "y")),
("", cp_cmd + (test_ebuild, test_ebuild[:-8] +
"2.ebuild")),
("", git_cmd + ("add", test_ebuild[:-8] + "2.ebuild")),
("", repoman_cmd + ("commit", "-m", "cat/pkg: bump to
version 2")),
--
2.16.2
