From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 13 Oct 2007 05:59:12 +0000 (-0000)
Subject: Remove a chdir() call that's no longer needed for the
X-Git-Tag: v2.2_pre1~633
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0490f1075976345333141cddf2e0d7c3ddeeb055;p=portage.git

Remove a chdir() call that's no longer needed for the
collision-protect symlink code.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index dd982408b..ded0943af 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1477,12 +1477,6 @@ class dblink(object):
 	def _collision_protect(self, srcroot, destroot, mypkglist, mycontents, mysymlinks):
 			collision_ignore = set([normalize_path(myignore) for myignore in \
 				self.settings.get("COLLISION_IGNORE", "").split()])
-
-			# the linkcheck only works if we are in srcroot
-			mycwd = os.getcwd()
-			os.chdir(srcroot)
-
-
 			mysymlinked_directories = [s + os.path.sep for s in mysymlinks]
 			del mysymlinks
 
@@ -1601,10 +1595,6 @@ class dblink(object):
 					print "None of the installed packages claim the above file(s)."
 					print
 				sys.exit(1)
-			try:
-				os.chdir(mycwd)
-			except OSError:
-				pass
 			return collisions
 
 	def _security_check(self, installed_instances):