Changeset 9695fa7

Timestamp:

08/10/2007 09:24:02 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

3aa2b81

Parents:

7c6c355

Message:

Failsafe tests to be sure that we are deleting an existing unpacked sources directory.
Thanks to Petr "Qaxi" Klíma for the report and patch.

Files:

• BLFS/libs/scripts.xsl (modified) (1 diff)
• common/makefile-functions (modified) (2 diffs)

BLFS/libs/scripts.xsl

@@ -156 +156 @@
 if [[ -e unpacked ]] ; then
   UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
-  rm -rf $UNPACKDIR
+  [[ -n $UNPACKDIR ]] && [[ -d $UNPACKDIR ]] && rm -rf $UNPACKDIR
 fi
 tar -xvf $PACKAGE > unpacked

common/makefile-functions

@@ -65 +65 @@
   @PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
+  test -n "$$ROOT" -a -d $(SRCSDIR)/$$ROOT && \
   rm -rf $(SRCSDIR)/$$ROOT && \
   rm -rf $(SRCSDIR)/$${ROOT%-*}-build
@@ -72 +73 @@
   @PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
+  test -n "$$ROOT" -a -d $(SRC)/$$ROOT && \
   rm -rf $(SRC)/$$ROOT && \
   rm -rf $(SRC)/$${ROOT%-*}-build