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.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e6e2de6a67e9f174b26d0539256f3a6d45319143..d3704b598bbbf7851013741ae53b23ae302330f6 100644 (file)
--- 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.