diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-01 20:59:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-01 20:59:56 +0000 |
| commit | 1e9a8016d05e2ee3ea04587f5705dce274b564be (patch) | |
| tree | b32ee083769880ae2127998e95e07820953a873e | |
| parent | 1b3078465cdaa35206047aec863c6614df46aca1 (diff) | |
| download | portage-1e9a8016d05e2ee3ea04587f5705dce274b564be.tar.gz portage-1e9a8016d05e2ee3ea04587f5705dce274b564be.tar.bz2 portage-1e9a8016d05e2ee3ea04587f5705dce274b564be.zip | |
Make binarytree.prevent_collision() update the Packages index since it changes the PATH attribute.
svn path=/main/trunk/; revision=6720
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 6 |
1 files changed, 5 insertions, 1 deletions
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 |