| 1 |
commit: c522bc7e2c2c116a061eca24a1697841947bc433 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 19:12:13 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 19:12:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c522bc7e |
| 7 |
|
| 8 |
emerge: rename --no*-atoms to --*-exclude |
| 9 |
|
| 10 |
--- |
| 11 |
man/emerge.1 | 4 ++-- |
| 12 |
pym/_emerge/depgraph.py | 16 ++++++++-------- |
| 13 |
pym/_emerge/help.py | 4 ++-- |
| 14 |
pym/_emerge/main.py | 16 ++++++++-------- |
| 15 |
pym/portage/tests/resolver/test_rebuild.py | 2 +- |
| 16 |
5 files changed, 21 insertions(+), 21 deletions(-) |
| 17 |
|
| 18 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 19 |
index 3dcd20c..f7b6043 100644 |
| 20 |
--- a/man/emerge.1 |
| 21 |
+++ b/man/emerge.1 |
| 22 |
@@ -485,11 +485,11 @@ may have changed. |
| 23 |
Disables the spinner for the session. The spinner is active when the |
| 24 |
terminal device is determined to be a TTY. This flag disables it regardless. |
| 25 |
.TP |
| 26 |
-.BR "\-\-nousepkg\-atoms " ATOMS |
| 27 |
+.BR "\-\-usepkg\-exclude " ATOMS |
| 28 |
A space separated list of package names or slot atoms. Emerge will ignore |
| 29 |
matching binary packages. |
| 30 |
.TP |
| 31 |
-.BR "\-\-norebuild\-atoms " ATOMS |
| 32 |
+.BR "\-\-rebuild\-exclude " ATOMS |
| 33 |
A space separated list of package names or slot atoms. Emerge will not rebuild |
| 34 |
matching packages due to \fB\-\-rebuild\fR. |
| 35 |
.TP |
| 36 |
|
| 37 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 38 |
index 80d701c..5183b27 100644 |
| 39 |
--- a/pym/_emerge/depgraph.py |
| 40 |
+++ b/pym/_emerge/depgraph.py |
| 41 |
@@ -124,12 +124,12 @@ class _frozen_depgraph_config(object): |
| 42 |
self.excluded_pkgs = _wildcard_set(atoms) |
| 43 |
atoms = ' '.join(myopts.get("--reinstall-atoms", [])).split() |
| 44 |
self.reinstall_atoms = _wildcard_set(atoms) |
| 45 |
- atoms = ' '.join(myopts.get("--nousepkg-atoms", [])).split() |
| 46 |
- self.nousepkg_atoms = _wildcard_set(atoms) |
| 47 |
+ atoms = ' '.join(myopts.get("--usepkg-exclude", [])).split() |
| 48 |
+ self.usepkg_exclude = _wildcard_set(atoms) |
| 49 |
atoms = ' '.join(myopts.get("--useoldpkg-atoms", [])).split() |
| 50 |
self.useoldpkg_atoms = _wildcard_set(atoms) |
| 51 |
- atoms = ' '.join(myopts.get("--norebuild-atoms", [])).split() |
| 52 |
- self.norebuild_atoms = _wildcard_set(atoms) |
| 53 |
+ atoms = ' '.join(myopts.get("--rebuild-exclude", [])).split() |
| 54 |
+ self.rebuild_exclude = _wildcard_set(atoms) |
| 55 |
|
| 56 |
self.rebuild = "--rebuild" in myopts |
| 57 |
|
| 58 |
@@ -155,11 +155,11 @@ class _rebuild_config(object): |
| 59 |
def add(self, dep_pkg, dep): |
| 60 |
parent = dep.collapsed_parent |
| 61 |
priority = dep.collapsed_priority |
| 62 |
- norebuild_atoms = self._frozen_config.norebuild_atoms |
| 63 |
+ rebuild_exclude = self._frozen_config.rebuild_exclude |
| 64 |
if (self._frozen_config.rebuild and isinstance(parent, Package) and |
| 65 |
parent.built and (priority.buildtime or priority.runtime) and |
| 66 |
isinstance(dep_pkg, Package) and |
| 67 |
- not norebuild_atoms.findAtomForPackage(parent)): |
| 68 |
+ not rebuild_exclude.findAtomForPackage(parent)): |
| 69 |
self._graph.add(dep_pkg, parent, priority) |
| 70 |
|
| 71 |
def _trigger_rebuild(self, parent, build_deps, runtime_deps): |
| 72 |
@@ -3406,7 +3406,7 @@ class depgraph(object): |
| 73 |
use_ebuild_visibility = self._frozen_config.myopts.get( |
| 74 |
'--use-ebuild-visibility', 'n') != 'n' |
| 75 |
reinstall_atoms = self._frozen_config.reinstall_atoms |
| 76 |
- nousepkg_atoms = self._frozen_config.nousepkg_atoms |
| 77 |
+ usepkg_exclude = self._frozen_config.usepkg_exclude |
| 78 |
useoldpkg_atoms = self._frozen_config.useoldpkg_atoms |
| 79 |
matched_oldpkg = [] |
| 80 |
# Behavior of the "selective" parameter depends on |
| 81 |
@@ -3454,7 +3454,7 @@ class depgraph(object): |
| 82 |
modified_use=self._pkg_use_enabled(pkg)): |
| 83 |
continue |
| 84 |
|
| 85 |
- if built and not installed and nousepkg_atoms.findAtomForPackage(pkg, \ |
| 86 |
+ if built and not installed and usepkg_exclude.findAtomForPackage(pkg, \ |
| 87 |
modified_use=self._pkg_use_enabled(pkg)): |
| 88 |
break |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py |
| 92 |
index bf2437d..85026ac 100644 |
| 93 |
--- a/pym/_emerge/help.py |
| 94 |
+++ b/pym/_emerge/help.py |
| 95 |
@@ -559,13 +559,13 @@ def help(myopts, havecolor=1): |
| 96 |
print(" "+green("--nospinner")) |
| 97 |
print(" Disables the spinner regardless of terminal type.") |
| 98 |
print() |
| 99 |
- print(" " + green("--nousepkg-atoms") + " " + turquoise("ATOMS")) |
| 100 |
+ print(" " + green("--usepkg-exclude") + " " + turquoise("ATOMS")) |
| 101 |
desc = "A space separated list of package names or slot atoms." + \ |
| 102 |
" Emerge will ignore matching binary packages." |
| 103 |
for line in wrap(desc, desc_width): |
| 104 |
print(desc_indent + line) |
| 105 |
print() |
| 106 |
- print(" " + green("--norebuild-atoms") + " " + turquoise("ATOMS")) |
| 107 |
+ print(" " + green("--rebuild-exclude") + " " + turquoise("ATOMS")) |
| 108 |
desc = "A space separated list of package names or slot atoms." + \ |
| 109 |
" Emerge will not rebuild matching packages due to --rebuild." |
| 110 |
for line in wrap(desc, desc_width): |
| 111 |
|
| 112 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 113 |
index 434fd5a..552ea20 100644 |
| 114 |
--- a/pym/_emerge/main.py |
| 115 |
+++ b/pym/_emerge/main.py |
| 116 |
@@ -735,14 +735,14 @@ def parse_opts(tmpcmdline, silent=False): |
| 117 |
"choices" : true_y_or_n |
| 118 |
}, |
| 119 |
|
| 120 |
- "--nousepkg-atoms": { |
| 121 |
+ "--usepkg-exclude": { |
| 122 |
"help" :"A space separated list of package names or slot atoms. " + \ |
| 123 |
"Emerge will ignore matching binary packages. ", |
| 124 |
|
| 125 |
"action" : "append", |
| 126 |
}, |
| 127 |
|
| 128 |
- "--norebuild-atoms": { |
| 129 |
+ "--rebuild-exclude": { |
| 130 |
"help" :"A space separated list of package names or slot atoms. " + \ |
| 131 |
"Emerge will not rebuild these packages due to the " + \ |
| 132 |
"--rebuild flag. ", |
| 133 |
@@ -926,16 +926,16 @@ def parse_opts(tmpcmdline, silent=False): |
| 134 |
parser.error("Invalid Atom(s) in --reinstall-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \ |
| 135 |
(",".join(bad_atoms),)) |
| 136 |
|
| 137 |
- if myoptions.norebuild_atoms: |
| 138 |
- bad_atoms = _find_bad_atoms(myoptions.norebuild_atoms) |
| 139 |
+ if myoptions.rebuild_exclude: |
| 140 |
+ bad_atoms = _find_bad_atoms(myoptions.rebuild_exclude) |
| 141 |
if bad_atoms and not silent: |
| 142 |
- parser.error("Invalid Atom(s) in --norebuild-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \ |
| 143 |
+ parser.error("Invalid Atom(s) in --rebuild-exclude parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \ |
| 144 |
(",".join(bad_atoms),)) |
| 145 |
|
| 146 |
- if myoptions.nousepkg_atoms: |
| 147 |
- bad_atoms = _find_bad_atoms(myoptions.nousepkg_atoms) |
| 148 |
+ if myoptions.usepkg_exclude: |
| 149 |
+ bad_atoms = _find_bad_atoms(myoptions.usepkg_exclude) |
| 150 |
if bad_atoms and not silent: |
| 151 |
- parser.error("Invalid Atom(s) in --nousepkg-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \ |
| 152 |
+ parser.error("Invalid Atom(s) in --usepkg-exclude parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \ |
| 153 |
(",".join(bad_atoms),)) |
| 154 |
|
| 155 |
if myoptions.useoldpkg_atoms: |
| 156 |
|
| 157 |
diff --git a/pym/portage/tests/resolver/test_rebuild.py b/pym/portage/tests/resolver/test_rebuild.py |
| 158 |
index 9a9e2ee..809dbed 100644 |
| 159 |
--- a/pym/portage/tests/resolver/test_rebuild.py |
| 160 |
+++ b/pym/portage/tests/resolver/test_rebuild.py |
| 161 |
@@ -45,7 +45,7 @@ class RebuildTestCase(TestCase): |
| 162 |
ResolverPlaygroundTestCase( |
| 163 |
["sys-libs/x"], |
| 164 |
options = {"--rebuild" : True, |
| 165 |
- "--norebuild-atoms" : ["sys-apps/b"]}, |
| 166 |
+ "--rebuild-exclude" : ["sys-apps/b"]}, |
| 167 |
mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/e-2'], |
| 168 |
ignore_mergelist_order = True, |
| 169 |
success = True), |
Archives