java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 +++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 39a055142be622c3835f8922d6e32b2e73299fdb
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Oct 17 15:17:20 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.57-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 678a35c..4db8b11 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.56
+Version: 2.1.57
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.57-1
+- 1020497 - re-applying fix from 122418187 that got missed in the merge in
+ c821c7ee2
+
* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.56-1
- 1020497 - provide a way to order kickstart scripts
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index ade0068..174f34e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.56-1 java/
+2.1.57-1 java/
commit c7917c0b99b5cfb253f20efac99a5eb8512f0910
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Oct 17 15:16:50 2013 -0400
1020497 - re-applying fix from 122418187 that got missed in the merge in c821c7ee2
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 75dfbfa..906e26e 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -613,7 +613,9 @@ public class KickstartFormatter {
else if (ksdata.getNonChrootPost() && !isPre &&
!kss.thisScriptIsChroot()) {
addLogBegin(retval, POST_LOG_NOCHROOT_FILE + "." +
this.postLogPostfix,
kss.getInterpreter());
- retval.append(RHN_TRACE);
+ if (isBashInterpreter(kss.getInterpreter())) {
+ retval.append(RHN_TRACE);
+ }
}
else {
retval.append(NEWLINE);