diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-24 06:43:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-24 06:43:09 +0000 |
| commit | eee40c7e4715a2d57745a4f18927381d6393f395 (patch) | |
| tree | be168fca79226253a9233800347d70fb12841453 /pym | |
| parent | 54697f2644844c83ae18480447b1b9cb4b784db7 (diff) | |
| download | portage-eee40c7e4715a2d57745a4f18927381d6393f395.tar.gz portage-eee40c7e4715a2d57745a4f18927381d6393f395.tar.bz2 portage-eee40c7e4715a2d57745a4f18927381d6393f395.zip | |
Always unlink the .installed flag prior to merge since portage.movefile() never leaves intact.
svn path=/main/trunk/; revision=6986
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index d27f320d6..f24c180a4 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1647,7 +1647,7 @@ class dblink(object): self._collision_protect(srcroot, destroot, others_in_slot, myfilelist+mylinklist, mylinklist) - if os.stat(srcroot).st_dev == os.stat(destroot).st_dev: + if True: """ The merge process may move files out of the image directory, which causes invalidation of the .installed flag.""" try: |