[izpack-changes] r1720 - in izpack-src/trunk: . src/lib/com/izforge/izpack/compiler src/lib/com/izforge/izpack/util

[noreply at berlios.de]

Author: dreil
Date: 2007-01-25 10:43:21 +0100 (Thu, 25 Jan 2007)
New Revision: 1720

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
   izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java
Log:
Added ignore as possible value for failure argument in executables


Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-01-24 10:05:54 UTC (rev 1719)
+++ izpack-src/trunk/Versions.txt	2007-01-25 09:43:21 UTC (rev 1720)
@@ -1,5 +1,8 @@
 [ The list of the different public versions of IzPack ]
+  > ???
 
+- Added ignore as possible value for failure argument in executables (Dennis Reil)
+
   > Next release
 
 - Added docu: executeForPack, executeclass,logfiledir  for ProcessPanel (Fabrice Mirabile)

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java	2007-01-24 10:05:54 UTC (rev 1719)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/CompilerConfig.java	2007-01-25 09:43:21 UTC (rev 1720)
@@ -647,6 +647,7 @@
                 if ("abort".equalsIgnoreCase(val))
                     executable.onFailure = ExecutableFile.ABORT;
                 else if ("warn".equalsIgnoreCase(val)) executable.onFailure = ExecutableFile.WARN;
+                else if ("ignore".equalsIgnoreCase(val)) executable.onFailure = ExecutableFile.IGNORE;
 
                 // whether to keep the executable after executing it
                 val = e.getAttribute("keep");

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java	2007-01-24 10:05:54 UTC (rev 1719)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/FileExecutor.java	2007-01-25 09:43:21 UTC (rev 1720)
@@ -360,6 +360,10 @@
                         handler.emitWarning("file execution error", message);
                         exitStatus = 0;
                     }
+                    else if (efile.onFailure == ExecutableFile.IGNORE){
+                        // do nothing  
+                        exitStatus = 0;
+                    }
                     else
                     {
                         if (handler