diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-09 21:32:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-09 21:32:45 +0000 |
| commit | 654c33f7489407bec3e093853460c522252abaaf (patch) | |
| tree | 4f2918f44837f74fb37ceb1c2ef2ace096d6051d | |
| parent | a948b62e27679033e5f0a6a2fd25706a50c5cd12 (diff) | |
| download | portage-654c33f7489407bec3e093853460c522252abaaf.tar.gz portage-654c33f7489407bec3e093853460c522252abaaf.tar.bz2 portage-654c33f7489407bec3e093853460c522252abaaf.zip | |
Make --newuse not imply --update anymore because that restriction is unnecessary.
svn path=/main/trunk/; revision=4641
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index e59f7a82e..877cc5141 100755 --- a/bin/emerge +++ b/bin/emerge @@ -355,9 +355,10 @@ def create_depgraph_params(myopts, myaction): myparams = ["recurse"] add=[] sub=[] - if "--update" in myopts or myaction in ("system", "world"): - add.extend(["selective"]) - if "--noreplace" in myopts: + if "--update" in myopts or \ + "--newuse" in myopts or \ + "--noreplace" in myopts or \ + myaction in ("system", "world"): add.extend(["selective"]) if "--emptytree" in myopts: add.extend(["empty"]) @@ -4069,10 +4070,6 @@ def emerge_main(): if ("--usepkgonly" in myopts) and not ("--usepkg" in myopts): myopts["--usepkg"] = True - if ("--newuse" in myopts) and not ("--update" in myopts): - print ">>> --newuse implies --update... adding --update to options." - myopts["--update"] = True - # Also allow -l to apply --pretend/-p, but if already in --ask mode if ("--changelog" in myopts) and not (("--pretend" in myopts) or ("--ask" in myopts)): print ">>> --changelog implies --pretend... adding --pretend to options." |