Add --buildpkgonly to the options lists that exempt from

slot collisions and world file updates. (trunk r8917)

svn path=/main/branches/2.1.2/; revision=8918

diff --git a/bin/emerge b/bin/emerge
index f174585c91de7095dcf2597e29125618869262c6..608c1ba9bd9a058bcf689179d4cce39b8fb895c0 100755 (executable)
--- 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