summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index f174585c9..608c1ba9b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2375,7 +2375,8 @@ class depgraph:
def _accept_collisions(self):
acceptable = False
- for x in ("--nodeps", "--pretend", "--fetchonly", "--fetch-all-uri"):
+ for x in ("--buildpkgonly", "--fetchonly",
+ "--fetch-all-uri", "--nodeps", "--pretend"):
if x in self.myopts:
acceptable = True
break
@@ -3458,7 +3459,7 @@ class depgraph:
def saveNomergeFavorites(self):
"""Find atoms in favorites that are not in the mergelist and add them
to the world file if necessary."""
- for x in ("--fetchonly", "--fetch-all-uri",
+ for x in ("--buildpkgonly", "--fetchonly", "--fetch-all-uri",
"--oneshot", "--onlydeps", "--pretend"):
if x in self.myopts:
return