From 198bfde314e61d016c8a75aed1120295cfd4213d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Aug 2010 03:02:34 -0700 Subject: Bug #332967 - In bintree.inject(), add a sanity check to make sure we don't try to call movefile on a package that's already in the correct location. --- pym/portage/dbapi/bintree.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index d84031681..2863b5c53 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -945,8 +945,9 @@ class binarytree(object): wantnewlockfile=1) if filename is not None: new_filename = self.getname(cpv) - self._ensure_dir(os.path.dirname(new_filename)) - _movefile(filename, new_filename, mysettings=self.settings) + if not os.path.samefile(filename, new_filename): + self._ensure_dir(os.path.dirname(new_filename)) + _movefile(filename, new_filename, mysettings=self.settings) if self._all_directory and \ self.getname(cpv).split(os.path.sep)[-2] == "All": self._create_symlink(cpv) -- cgit v1.2.3-1-g7c22