diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-07 21:25:23 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-07 21:28:44 -0800 |
| commit | 4c47e5857515ea69150fb1d7731e4a6c88b4476e (patch) | |
| tree | 905fe75d9f0bbc28d94f214fa57728ee66dbe278 | |
| parent | 25e600ecd6cf89a5c9424a2e63859b5dd1d1a941 (diff) | |
| download | portage-4c47e5857515ea69150fb1d7731e4a6c88b4476e.tar.gz portage-4c47e5857515ea69150fb1d7731e4a6c88b4476e.tar.bz2 portage-4c47e5857515ea69150fb1d7731e4a6c88b4476e.zip | |
quickpkg: revert hardlink fix from bug #185305
For some reason, bug #185305 no longer seems to be an issue, and the
fix/workaround seems to cause bug 338509.
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e6e2de6a6..d3704b598 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4093,8 +4093,6 @@ def tar_contents(contents, root, tar, protect=None, onProgress=None): else: os = portage.os - from portage.util import normalize_path - import tarfile root = normalize_path(root).rstrip(os.path.sep) + os.path.sep id_strings = {} maxval = len(contents) @@ -4131,8 +4129,6 @@ def tar_contents(contents, root, tar, protect=None, onProgress=None): tarinfo = tar.gettarinfo(live_path, arcname) if stat.S_ISREG(lst.st_mode): - # break hardlinks due to bug #185305 - tarinfo.type = tarfile.REGTYPE if protect and protect(path): # Create an empty file as a place holder in order to avoid # potential collision-protect issues. |