From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Dec 2007 21:22:25 +0000 (-0000)
Subject: Add --buildpkgonly to the options lists that exempt from
X-Git-Tag: v2.1.4~111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46598207a7e6b22189269d8a815b98b7bc567b15;p=portage.git

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 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