[Fai-commit] r6424 - branches/stable/3.4/bin

[Michael Prokop]

Author: mika
Date: 2011-04-15 17:46:33 +0000 (Fri, 15 Apr 2011)
New Revision: 6424

Modified:
   branches/stable/3.4/bin/fai-do-scripts
Log:
bin/fai-do-scripts: also ignore files with suffix .dpkg-dist and .dpkg-tmp

We definitely do not want to execute such files in
do_script() of fai-do-scripts, so let's skip them
as well.

Verified against lib/dpkg/dpkg.h of dpkg v1.15.8.10.

(cherry picked from commit 340b9826b78c707cd20e8858569aaf33b9da72de)

Modified: branches/stable/3.4/bin/fai-do-scripts
===================================================================
--- branches/stable/3.4/bin/fai-do-scripts	2011-04-15 17:46:29 UTC (rev 6423)
+++ branches/stable/3.4/bin/fai-do-scripts	2011-04-15 17:46:33 UTC (rev 6424)
@@ -86,6 +86,8 @@
 	*.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 ;;
+	*.dpkg-tmp)  [ X$debug = X1 ] && echo "Skipping file $file"; return ;;
+	*.dpkg-dist) [ X$debug = X1 ] && echo "Skipping file $file"; return ;;
     esac
 
     name=${file##*/}  # basename function