[izpack-changes] r1947 - in izpack-src/trunk/src/lib/com/izforge/izpack: compiler installer

[noreply at berlios.de]

Author: jponge
Date: 2007-12-11 23:32:44 +0100 (Tue, 11 Dec 2007)
New Revision: 1947

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Packager.java
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java
Log:
Bugfixes


Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Packager.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Packager.java	2007-12-11 22:12:27 UTC (rev 1946)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Packager.java	2007-12-11 22:32:44 UTC (rev 1947)
@@ -341,11 +341,14 @@
             packNumber++;
         }
         
-        // Wrtie packsinfo for web installers
-        FileWriter writer = new FileWriter(baseFile.getParent()
+        // Write packsinfo for web installers
+		if (packJarsSeparate)
+        {
+			FileWriter writer = new FileWriter(baseFile.getParent()
               + File.separator + "packsinfo.xml");
-        XMLWriter xmlwriter = new XMLWriter(writer);
-        xmlwriter.write(root);
+        	XMLWriter xmlwriter = new XMLWriter(writer);
+        	xmlwriter.write(root);
+		}
         
         // Now that we know sizes, write pack metadata to primary jar.
         primaryJarStream.putNextEntry(new org.apache.tools.zip.ZipEntry("packs.info"));

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java	2007-12-11 22:12:27 UTC (rev 1946)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/Unpacker.java	2007-12-11 22:32:44 UTC (rev 1947)
@@ -146,6 +146,7 @@
                     if (pf.hasCondition() && (rules != null)) {
                         if (!rules.isConditionTrue(pf.getCondition())) {
                             // skip, condition is not fulfilled
+							objIn.skip(pf.length());
                             continue;
                         }
                     }