diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-17 20:41:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-17 20:41:22 +0000 |
| commit | 885429d5bc8b6026f21186d4124b2b1f13d7e68c (patch) | |
| tree | c707c4e4ae35ce517bb50719d4cd5dd56494c548 | |
| parent | f3507fd877136090405a1119ab98503bc4b000e0 (diff) | |
| download | portage-885429d5bc8b6026f21186d4124b2b1f13d7e68c.tar.gz portage-885429d5bc8b6026f21186d4124b2b1f13d7e68c.tar.bz2 portage-885429d5bc8b6026f21186d4124b2b1f13d7e68c.zip | |
Always unlink the .installed flag prior to merge since
portage.movefile() never leaves intact. (trunk r6986)
svn path=/main/branches/2.1.2/; revision=8164
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 702f790ee..337c53b0a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8040,7 +8040,7 @@ class dblink: print sys.exit(1) - 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: |