Author: jkf
Date: Sun Feb 8 11:33:56 2009
New Revision: 742061
URL: http://svn.apache.org/viewvc?rev=742061&view=rev
Log:
Bugzilla Report 46659, space missing between define and value in RPM task
(verified against help page of rpm).
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=742061&r1=742060&r2=742061&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Feb 8 11:33:56 2009
@@ -137,6 +137,9 @@
Fixed bugs:
-----------
+ * RPM task needed an inserted space between the define and the value.
+ bugzilla Report 46659.
+
* Got rid of deadlock between in in, out and err in the Redirector.
Bugzilla Report 44544.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java?rev=742061&r1=742060&r2=742061&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java Sun
Feb 8 11:33:56 2009
@@ -120,7 +120,7 @@
: rpmBuildCommand);
if (topDir != null) {
toExecute.createArgument().setValue("--define");
- toExecute.createArgument().setValue("_topdir" + topDir);
+ toExecute.createArgument().setValue("_topdir " + topDir);
}
toExecute.createArgument().setLine(command);
@@ -187,9 +187,8 @@
+ "' failed with exit code " + returncode;
if (failOnError) {
throw new BuildException(msg);
- } else {
- log(msg, Project.MSG_ERR);
}
+ log(msg, Project.MSG_ERR);
}
} catch (IOException e) {
throw new BuildException(e, getLocation());
