From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Dec 2010 05:25:23 +0000 (-0800)
Subject: quickpkg: revert hardlink fix from bug #185305
X-Git-Tag: v2.1.9.26~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=616623d2fc4b907329dbc2f751a332fc12a41ba7;p=portage.git

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 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.