From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 1 Oct 2006 23:15:49 +0000 (-0000)
Subject: For bug #149781, exclude symlinks to directories when creating binary package with... 
X-Git-Tag: v2.1.2~734
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4dbb9365365fbeaa404cee6505e631b7f41e38b;p=portage.git

For bug #149781, exclude symlinks to directories when creating binary package with quickpkg.

svn path=/main/trunk/; revision=4570
---

diff --git a/bin/quickpkg b/bin/quickpkg
index 1153fba8a..7121d65d0 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -87,7 +87,11 @@ do_pkg() {
 					NF=NF-3
 			}
 			print
-		}' "${SRCDIR}"/CONTENTS | cut -f2- -d" " - | sed -e 's:^/:./:' > "${MYDIR}"/filelist
+		}' "${SRCDIR}"/CONTENTS | cut -f2- -d" " - | sed -e 's:^/:./:' | \
+		while read f; do
+			[ -d "${ROOT}/${f}" ] && [ -h "${ROOT}/${f}" ] && continue
+			echo "$f"
+		done > "${MYDIR}"/filelist
 		tar vjcf "${pkg_tmp}" -C "${ROOT}" --files-from="${MYDIR}"/filelist --no-recursion
 
 		# join together the basic tbz2 and the pkg info files