summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/main.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-02 12:12:13 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-02 12:12:13 -0700
commitc522bc7e2c2c116a061eca24a1697841947bc433 (patch)
treed3372ec0b6c3a868449022953f8271e5e9792068 /pym/_emerge/main.py
parente5977579376dd124bb341263f73a5d302dbc0863 (diff)
downloadportage-c522bc7e2c2c116a061eca24a1697841947bc433.tar.gz
portage-c522bc7e2c2c116a061eca24a1697841947bc433.tar.bz2
portage-c522bc7e2c2c116a061eca24a1697841947bc433.zip
emerge: rename --no*-atoms to --*-exclude
Diffstat (limited to 'pym/_emerge/main.py')
-rw-r--r--pym/_emerge/main.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 434fd5a57..552ea2082 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -735,14 +735,14 @@ def parse_opts(tmpcmdline, silent=False):
"choices" : true_y_or_n
},
- "--nousepkg-atoms": {
+ "--usepkg-exclude": {
"help" :"A space separated list of package names or slot atoms. " + \
"Emerge will ignore matching binary packages. ",
"action" : "append",
},
- "--norebuild-atoms": {
+ "--rebuild-exclude": {
"help" :"A space separated list of package names or slot atoms. " + \
"Emerge will not rebuild these packages due to the " + \
"--rebuild flag. ",
@@ -926,16 +926,16 @@ def parse_opts(tmpcmdline, silent=False):
parser.error("Invalid Atom(s) in --reinstall-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
(",".join(bad_atoms),))
- if myoptions.norebuild_atoms:
- bad_atoms = _find_bad_atoms(myoptions.norebuild_atoms)
+ if myoptions.rebuild_exclude:
+ bad_atoms = _find_bad_atoms(myoptions.rebuild_exclude)
if bad_atoms and not silent:
- parser.error("Invalid Atom(s) in --norebuild-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
+ parser.error("Invalid Atom(s) in --rebuild-exclude parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
(",".join(bad_atoms),))
- if myoptions.nousepkg_atoms:
- bad_atoms = _find_bad_atoms(myoptions.nousepkg_atoms)
+ if myoptions.usepkg_exclude:
+ bad_atoms = _find_bad_atoms(myoptions.usepkg_exclude)
if bad_atoms and not silent:
- parser.error("Invalid Atom(s) in --nousepkg-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
+ parser.error("Invalid Atom(s) in --usepkg-exclude parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
(",".join(bad_atoms),))
if myoptions.useoldpkg_atoms: