diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-13 05:59:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-13 05:59:12 +0000 |
| commit | 0490f1075976345333141cddf2e0d7c3ddeeb055 (patch) | |
| tree | a307f76e569cd0fd4cfaa6126f8c4045b38d08f2 | |
| parent | 3be3791673fcfa566f4173529676fe2d87c4f01f (diff) | |
| download | portage-0490f1075976345333141cddf2e0d7c3ddeeb055.tar.gz portage-0490f1075976345333141cddf2e0d7c3ddeeb055.tar.bz2 portage-0490f1075976345333141cddf2e0d7c3ddeeb055.zip | |
Remove a chdir() call that's no longer needed for the
collision-protect symlink code.
svn path=/main/trunk/; revision=8098
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 10 |
1 files changed, 0 insertions, 10 deletions
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): |