From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 24 Apr 2008 03:17:26 +0000 (-0000)
Subject: Fix interaction between automatic uninstall and options like --pretend,
X-Git-Tag: v2.2_pre6~122
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dac0dda2a563d22c4507fd7a463a53a06256f73f;p=portage.git

Fix interaction between automatic uninstall and options like --pretend,
--fetchonly, and --buildpkgonly.

svn path=/main/trunk/; revision=9956
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 43f57349a..99e8b5a64 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4870,6 +4870,7 @@ class MergeTask(object):
 	def _merge(self, mylist, favorites, mtimedb):
 		from portage.elog import elog_process
 		from portage.elog.filtering import filter_mergephases
+		buildpkgonly = "--buildpkgonly" in self.myopts
 		failed_fetches = []
 		fetchonly = "--fetchonly" in self.myopts or \
 			"--fetch-all-uri" in self.myopts
@@ -5021,7 +5022,8 @@ class MergeTask(object):
 				cpv=pkg_key, built=built, installed=installed,
 				metadata=metadata)
 			if pkg.installed:
-				self._uninstall_queue.append(pkg)
+				if not (buildpkgonly or fetchonly or pretend):
+					self._uninstall_queue.append(pkg)
 				continue
 
 			if x[0]=="blocks":