summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-01 23:15:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-01 23:15:49 +0000
commitd4dbb9365365fbeaa404cee6505e631b7f41e38b (patch)
tree47841131c222abf2790c844b192e99009c004b6d
parent8b5f3ce9b72f2f63af6d4b8292d5a531a7ac1b01 (diff)
downloadportage-d4dbb9365365fbeaa404cee6505e631b7f41e38b.tar.gz
portage-d4dbb9365365fbeaa404cee6505e631b7f41e38b.tar.bz2
portage-d4dbb9365365fbeaa404cee6505e631b7f41e38b.zip
For bug #149781, exclude symlinks to directories when creating binary package with quickpkg.
svn path=/main/trunk/; revision=4570
-rwxr-xr-xbin/quickpkg6
1 files changed, 5 insertions, 1 deletions
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