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

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

diff --git a/bin/quickpkg b/bin/quickpkg
index 1153fba8a7011046b7875d513dcaef3af1140335..7121d65d08bcaaf986a61ecb08e942a7d26cca43 100755 (executable)
--- 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