summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-12-07 21:25:23 -0800
committerZac Medico <zmedico@gentoo.org>2010-12-07 21:49:52 -0800
commit616623d2fc4b907329dbc2f751a332fc12a41ba7 (patch)
tree9a6754a54d7bd3291598b6b08e01c60d0bffd787
parent1eefd391f3380364e96564831bc560232d37e85b (diff)
downloadportage-616623d2fc4b907329dbc2f751a332fc12a41ba7.tar.gz
portage-616623d2fc4b907329dbc2f751a332fc12a41ba7.tar.bz2
portage-616623d2fc4b907329dbc2f751a332fc12a41ba7.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.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d386880f4..ee8e3e3b5 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4092,8 +4092,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)
@@ -4130,8 +4128,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.