diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-02-21 11:47:05 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-02-21 11:47:05 -0500 |
| commit | 600c978410a8fd5cba548d209e21f8d7d5a67aa1 (patch) | |
| tree | ab0ff1179b1486dd177fe7285134e6120d1c788f | |
| parent | pmerge: minor wording and naming changes (diff) | |
| download | pkgcore-600c978410a8fd5cba548d209e21f8d7d5a67aa1.tar.gz pkgcore-600c978410a8fd5cba548d209e21f8d7d5a67aa1.tar.bz2 pkgcore-600c978410a8fd5cba548d209e21f8d7d5a67aa1.zip | |
pmerge: remove references to -s set syntax
It was removed in preference for @set.
| -rw-r--r-- | pkgcore/scripts/pmerge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgcore/scripts/pmerge.py b/pkgcore/scripts/pmerge.py index a4ddac266..3b34a1ac6 100644 --- a/pkgcore/scripts/pmerge.py +++ b/pkgcore/scripts/pmerge.py @@ -66,9 +66,9 @@ merge_mode.add_argument( help='unmerge a package') merge_mode.add_argument( '--clean', action='store_true', - help='Remove installed packages that are not referenced by any ' - 'target packages/sets; defaults to -s world -s system if no targets ' - 'are specified. Use with *caution*, this option used incorrectly ' + help='Remove installed packages that are not referenced by any target ' + 'packages/sets; defaults to using the world and system sets if no ' + 'targets are specified. Use with *caution*, this option used incorrectly ' 'can render your system unusable. Note that this implies --deep.') merge_mode.add_argument( '-p', '--pretend', action='store_true', @@ -472,7 +472,7 @@ def main(options, out, err): if token in config.pkgset: out.error( 'No package matches %s, but there is a set with ' - 'that name. Use -s to specify a set.' % (token,)) + 'that name. Use @set to specify a set.' % (token,)) return 2 elif not options.ignore_failures: out.error('No matches for %s; ignoring it' % (token,)) |