diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-07-11 04:58:10 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-07-11 04:58:10 +0000 |
commit | ee6dea0f2a5bce56db31f4ddd84b09ad97fcf71e (patch) | |
tree | 476af1ad44777d7c2dfedb879868db41e92497ea | |
parent | 34cd2b2cc22617a17afd77b02f3dbb54c9b17217 (diff) | |
download | portage-ee6dea0f2a5bce56db31f4ddd84b09ad97fcf71e.tar.gz portage-ee6dea0f2a5bce56db31f4ddd84b09ad97fcf71e.tar.bz2 portage-ee6dea0f2a5bce56db31f4ddd84b09ad97fcf71e.zip |
Simplify logic mapping of options to depgraph params (trunk r7206 and r7230).
svn path=/main/branches/2.1.2/; revision=7231
-rwxr-xr-x | bin/emerge | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/bin/emerge b/bin/emerge index 78da49f34..557d33fcd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -343,28 +343,20 @@ def create_depgraph_params(myopts, myaction): # recurse: go into the dependencies # deep: go into the dependencies of already merged packages # empty: pretend nothing is merged - myparams = ["recurse"] - add=[] - sub=[] + myparams = set(["recurse"]) if "--update" in myopts or \ "--newuse" in myopts or \ "--reinstall" in myopts or \ "--noreplace" in myopts or \ myaction in ("system", "world"): - add.extend(["selective"]) + myparams.add("selective") if "--emptytree" in myopts: - add.extend(["empty"]) - sub.extend(["selective"]) + myparams.add("empty") + myparams.discard("selective") if "--nodeps" in myopts: - sub.extend(["recurse"]) + myparams.discard("recurse") if "--deep" in myopts: - add.extend(["deep"]) - for x in add: - if (x not in myparams) and (x not in sub): - myparams.append(x) - for x in sub: - if x in myparams: - myparams.remove(x) + myparams.add("deep") return myparams # search functionality |