[pkg-java] r13766 - in trunk/maven-debian-helper: debian maven-packager-utils/src/main/java/org/debian/maven/packager

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-06-07 22:52:16 +0000 (Tue, 07 Jun 2011)
New Revision: 13766

Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
Log:
DependenciesSolver: Don't use Properties.store() method since
it escape some chars (like " >\=") from variables.
Replace it with simple FileWriter. Closes: #628272.

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2011-06-07 21:35:20 UTC (rev 13765)
+++ trunk/maven-debian-helper/debian/changelog	2011-06-07 22:52:16 UTC (rev 13766)
@@ -1,3 +1,11 @@
+maven-debian-helper (1.4.3) UNRELEASED; urgency=low
+
+  * DependenciesSolver: Don't use Properties.store() method since
+    it escape some chars (like " >\=") from variables.
+    Replace it with simple FileWriter. Closes: #628272.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 08 Jun 2011 00:51:52 +0200
+
 maven-debian-helper (1.4.2) unstable; urgency=low
 
   * mh_resolve_dependencies: Handle --verbose option has described in

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java	2011-06-07 21:35:20 UTC (rev 13765)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java	2011-06-07 22:52:16 UTC (rev 13766)
@@ -17,9 +17,10 @@
  */
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -444,8 +445,25 @@
         if (packageVersion != null) {
             depVars.put("maven.UpstreamPackageVersion", packageVersion);
         }
+        // Write everything to debian/substvars
         try {
-            depVars.store(new FileOutputStream(dependencies), "List of dependencies for " + packageName + ", generated for use by debian/control");
+            FileWriter fstream = new FileWriter(dependencies);
+            BufferedWriter out = new BufferedWriter(fstream);
+            out.write("#List of dependencies for " + packageName + ", generated for use by debian/control");
+            out.write("\n");
+            Set propertiesNames = depVars.stringPropertyNames();
+            if (propertiesNames != null) {
+        	for (Iterator i = propertiesNames.iterator(); i.hasNext();) {
+        	   String propName = (String) i.next();
+        	   StringBuffer sb = new StringBuffer();
+        	   sb.append(propName);
+        	   sb.append("=");
+        	   sb.append(depVars.get(propName));
+        	   sb.append("\n");
+        	   out.write(sb.toString());
+                }
+            }
+            out.close();
         } catch (IOException ex) {
             log.log(Level.SEVERE, "Error while saving file " + dependencies, ex);
         }