[Fai-commit] r5330 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-04-15 21:50:41 +0000 (Wed, 15 Apr 2009)
New Revision: 5330

Modified:
   trunk/bin/fai-do-scripts
   trunk/debian/changelog
Log:
fai-do-scripts: skip files with certain suffixes (closes: #500579),
improve test if $debug is set to 1 (closes: #496072)

Modified: trunk/bin/fai-do-scripts
===================================================================
--- trunk/bin/fai-do-scripts	2009-04-15 21:37:41 UTC (rev 5329)
+++ trunk/bin/fai-do-scripts	2009-04-15 21:50:41 UTC (rev 5330)
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.6.3, 9-apr-2009"
+version="version 1.6.4, 15-apr-2009"
 
 # variables needed: $classes, $cfclasses, $LOGDIR
 # 
@@ -86,10 +86,10 @@
 
     # may be remove some day
     case $file in
-	*~) [ "$debug" ] && echo "Skipping backup file $file";	 return ;;
-	*.dpkg-old) [ "$debug" ] && echo "Skipping file $file";	 return ;;
-	*.dpkg-new) [ "$debug" ] && echo "Skipping file $file";	 return ;;
-	*.dpkg-inst) [ "$debug" ] && echo "Skipping file $file"; return ;;
+	*~) [ X$debug = X1 ] && echo "Skipping backup file $file";	 return ;;
+	*.dpkg-old)  [ X$debug = X1 ] && echo "Skipping file $file";	 return ;;
+	*.dpkg-new)  [ X$debug = X1 ] && echo "Skipping file $file";	 return ;;
+	*.dpkg-inst) [ X$debug = X1 ] && echo "Skipping file $file"; return ;;
     esac
 
     name=$(basename $file)
@@ -107,9 +107,9 @@
     shelldebug=
     case $filetype in
 	*"POSIX shell script"*|*"Bourne shell script"*)
-	    [ "$debug" ] && shelldebug="sh -x" ;;
+	    [ X$debug = X1 ] && shelldebug="sh -x" ;;
 	*"Bourne-Again shell script"*)
-	    [ "$debug" ] && shelldebug="bash -x" ;;
+	    [ X$debug = X1 ] && shelldebug="bash -x" ;;
     esac
 
     case $filetype in
@@ -184,7 +184,7 @@
     exit 9
 fi
 
-[ "$debug" ] && cfagentdebug=-v
+[ X$debug = X1 ] && cfagentdebug=-v
 
 call_conf $1
 # move error number from child scripts to 100+x if any error happened

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-15 21:37:41 UTC (rev 5329)
+++ trunk/debian/changelog	2009-04-15 21:50:41 UTC (rev 5330)
@@ -9,7 +9,8 @@
     -k now also upgrades all packages inside the nfsroot,
     add -N to install_packages call, this is good for cross architecture
     building the nfsroot
-  * fai-do-scripts: skip files with certain suffixes (closes: #500579)
+  * fai-do-scripts: skip files with certain suffixes (closes: #500579),
+    improve test if $debug is set to 1 (closes: #496072)
     call cfagent scripts with -v if fai is in debug mode
   * lib/subroutines-linux: don't rely on ' as a field separator when
     parsing boot.log, use = and strip off any quotes (closes: #439250)
@@ -93,7 +94,7 @@
   * setup-storage/Parser.pm: Only test for mkfs.X if such a filesystem is to
     be created (i.e., it will not be preserved)
 
- -- Thomas Lange <lange at debian.org>  Wed, 15 Apr 2009 23:37:21 +0200
+ -- Thomas Lange <lange at debian.org>  Wed, 15 Apr 2009 23:50:27 +0200
 
 fai (3.2.17) unstable; urgency=medium