| 1 |
Sorry, not unmerging, but when emerging binary files. |
| 2 |
|
| 3 |
Alan. |
| 4 |
|
| 5 |
On Fri, 2010-07-09 at 23:41 +0100, Alan Hourihane wrote: |
| 6 |
> When unmerging I bump into a duplicate name check. This patch fixes it |
| 7 |
> for me... |
| 8 |
> |
| 9 |
> Alan. |
| 10 |
> |
| 11 |
> --- bad/pym/portage/dbapi/bintree.py 2010-04-30 08:52:37.000000000 +0000 |
| 12 |
> +++ good/pym/portage/dbapi/bintree.py 2010-04-30 08:52:53.000000000 |
| 13 |
> +0000 |
| 14 |
> @@ -939,7 +939,8 @@ |
| 15 |
> if filename is not None: |
| 16 |
> new_filename = self.getname(cpv) |
| 17 |
> self._ensure_dir(os.path.dirname(new_filename)) |
| 18 |
> - _movefile(filename, new_filename, mysettings=self.settings) |
| 19 |
> + if filename != new_filename: |
| 20 |
> + _movefile(filename, new_filename, mysettings=self.settings) |
| 21 |
> if self._all_directory and \ |
| 22 |
> self.getname(cpv).split(os.path.sep)[-2] == "All": |
| 23 |
> self._create_symlink(cpv) |
| 24 |
> |
| 25 |
> |
| 26 |
> |
Archives