Changeset d7390a5 for common

Timestamp:

02/10/2012 09:33:23 AM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

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

Children:

743414b

Parents:

608fbe1

Message:

Changes the logic of "rebuild files" so that jhalfs does not stop if this item is ticked and the build dir is empty

File:

• common/common-functions (modified) (4 diffs)

common/common-functions

@@ -47 +47 @@
 clean_builddir() {           #
 #----------------------------#
-  # Test if the clean must be done.
-  if [ "${CLEAN}" = "y" ]; then
+# Test if the clean must be done.
+if [ "${CLEAN}" = "y" ]; then
+  # If empty (i.e. could contain lost+found), do not do anything
+  if $(ls $BUILDDIR/* > /dev/null 2>&1) &&
+       [ "$(ls $BUILDDIR)" != "lost+found" ]; then
     # Test to make sure that the build directory was populated by jhalfs
     if [ ! -d $JHALFSDIR ] || [ ! -d $BUILDDIR/sources ] ; then
@@ -55 +58 @@
     # Test that dev filesystems are not mounted in $BUILDDIR
     elif mount | grep $BUILDDIR/dev > /dev/null ; then
-      echo "Looks like kernel fylesystems are yet mounted on $BUILDDIR."
+      echo "Looks like kernel filesystems are still mounted on $BUILDDIR."
       exit 1
     else
@@ -61 +64 @@
       echo -n "Cleaning $BUILDDIR ..."
       # First delete proc and sys directories, if exist.
-      # Both should be empty. If not, be sure to exit.
+      # Both should be empty. If not, we exit, and the rmdir command
+      # has generated an error message
       if [ -d $BUILDDIR/proc ] ; then
         sudo rmdir $BUILDDIR/proc || exit 1
@@ -78 +82 @@
     fi
   fi
+fi
 }