Browse Source

Bugzilla Report 46659, space missing between define and value in RPM task (verified against help page of rpm).

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@742061 13f79535-47bb-0310-9956-ffa450edef68
master
Jacobus Martinus Kruithof 16 years ago
parent
commit
479a97c386
2 changed files with 5 additions and 3 deletions
  1. +3
    -0
      WHATSNEW
  2. +2
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java

+ 3
- 0
WHATSNEW View File

@@ -137,6 +137,9 @@ Changes that could break older environments:

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.



+ 2
- 3
src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java View File

@@ -120,7 +120,7 @@ public class Rpm extends Task {
: 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 @@ public class Rpm extends Task {
+ "' 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());


Loading…
Cancel
Save