r2739 - jhalfs/trunk/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Jun 1 12:52:45 PDT 2006


Author: manuel
Date: 2006-06-01 13:52:44 -0600 (Thu, 01 Jun 2006)
New Revision: 2739

Modified:
   jhalfs/trunk/common/common-functions
Log:
Fixed a bug in wrt_remove_existing_dirs when both bz2 and gz version of the same package are found in sources dir.

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-01 19:17:52 UTC (rev 2738)
+++ jhalfs/trunk/common/common-functions	2006-06-01 19:52:44 UTC (rev 2739)
@@ -214,7 +214,8 @@
   local PKG_NAME=$1
 (
 cat << EOF
-	@ROOT=\`tar -tf \$(MOUNT_PT)\$(SRC)/${PKG_NAME} | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
+	@PKG_PATH=\`ls -t \$(MOUNT_PT)\$(SRC)/${PKG_NAME} | head -n1\` && \\
+	ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
 	[[ -n \$\$ROOT ]] && \\
 	rm -rf \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
 	if [ -e \$(MOUNT_PT)\$(SRC)/${PKG_NAME%%-*}-build ]; then \\
@@ -230,7 +231,8 @@
   local PKG_NAME=$1
 (
 cat << EOF
-	@ROOT=\`tar -tf \$(SRC)/${PKG_NAME} | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
+	@PKG_PATH=\`ls -t \$(SRC)/${PKG_NAME} | head -n1\` && \\
+	ROOT=\`tar -tf \$\$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'\` && \\
 	[[ -n \$\$ROOT ]] && \\
 	rm -rf \$(SRC)/\$\$ROOT && \\
 	if [ -e \$(SRC)/${PKG_NAME%%-*}-build ]; then \\




More information about the alfs-log mailing list