diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-02-21 10:59:36 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-02-21 10:59:36 -0500 |
| commit | 01e94ff0c388c0c89a4b3a497979a5b6f686a54f (patch) | |
| tree | b05de7da6c91c002ee25d60fdfd8790a603c2624 | |
| parent | domain: respect USE settings from the environment (diff) | |
| download | pkgcore-01e94ff0c388c0c89a4b3a497979a5b6f686a54f.tar.gz pkgcore-01e94ff0c388c0c89a4b3a497979a5b6f686a54f.tar.bz2 pkgcore-01e94ff0c388c0c89a4b3a497979a5b6f686a54f.zip | |
pmerge: minor wording and naming changes
| -rw-r--r-- | pkgcore/scripts/pmerge.py | 4 | ||||
| -rw-r--r-- | pkgcore/test/scripts/test_pmerge.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgcore/scripts/pmerge.py b/pkgcore/scripts/pmerge.py index 0e3169f19..a4ddac266 100644 --- a/pkgcore/scripts/pmerge.py +++ b/pkgcore/scripts/pmerge.py @@ -333,7 +333,7 @@ def _validate(parser, namespace): namespace.deep = True if namespace.usepkgonly or namespace.usepkg or namespace.source_only: parser.error( - '--clean cannot be used with any of the following namespace: ' + '--clean cannot be used with any of the following options: ' '--usepkg --usepkgonly --source-only') elif namespace.usepkgonly and namespace.usepkg: parser.error('--usepkg is redundant when --usepkgonly is used') @@ -475,7 +475,7 @@ def main(options, out, err): 'that name. Use -s to specify a set.' % (token,)) return 2 elif not options.ignore_failures: - out.error('No matches for %s; ignoring it' % token) + out.error('No matches for %s; ignoring it' % (token,)) else: return -1 else: diff --git a/pkgcore/test/scripts/test_pmerge.py b/pkgcore/test/scripts/test_pmerge.py index 38f48d14e..9927e7487 100644 --- a/pkgcore/test/scripts/test_pmerge.py +++ b/pkgcore/test/scripts/test_pmerge.py @@ -14,7 +14,7 @@ default_formatter = basics.HardCodedConfigSection({ }) -class AtomParsingTest(TestCase): +class TargetParsingTest(TestCase): def test_parse_target(self): repo = util.SimpleTree({'spork': {'foon': ('1', '1.0.1', '2')}}) |