From: Zac Medico Date: Fri, 1 Jun 2007 20:59:56 +0000 (-0000) Subject: Make binarytree.prevent_collision() update the Packages index since it changes the... X-Git-Tag: v2.2_pre1~1308 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1e9a8016d05e2ee3ea04587f5705dce274b564be;p=portage.git Make binarytree.prevent_collision() update the Packages index since it changes the PATH attribute. svn path=/main/trunk/; revision=6720 --- diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 061a8d8d8..15827ede5 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -266,10 +266,14 @@ class binarytree(object): other_cat = portage.xpak.tbz2(dest_path).getfile("CATEGORY") if other_cat: other_cat = other_cat.strip() - self._move_from_all(other_cat + "/" + mypkg) + other_cpv = other_cat + "/" + mypkg + self._move_from_all(other_cpv) + self.inject(other_cpv) """The file may or may not exist. Move it if necessary and update internal state for future calls to getname().""" self._move_to_all(cpv) + if os.path.exists(full_path): + self.inject(cpv) def _move_to_all(self, cpv): """If the file exists, move it. Whether or not it exists, update state