java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 6594e15206127a1cc808f621cd3549170873b293
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 22 16:41:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.4.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ff23004..295ad69 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.36
+Version: 1.4.37
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 22 2011 Jan Pazdziora 1.4.37-1
+- 679009 - fixing the regular expression.
+
* Thu Apr 14 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.36-1
- adding jakarta-commons-io Require (tlestach(a)redhat.com)
- adding jakarta-commons-fileupload Require for spacewalk-java
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e6175ee..933b65d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.36-1 java/
+1.4.37-1 java/
commit c3b4e3372788037e0b4e229bdd1d538803397c53
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 22 16:39:19 2011 +0200
679009 - fixing the regular expression.
Addressing
Umatched ( in regex; marked by <-- HERE in m/^(\s*( <-- HERE noSSLS/ at -e line
1
(cherry picked from commit abc3b614491d97df5b60c487b563ae5ef7726fb2)
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 3276589..b261c92 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -640,13 +640,13 @@ public class KickstartFormatter {
log.debug("adding perl -npe for /etc/sysconfig/rhn/up2date");
if (this.ksdata.isRhel2()) {
retval.append("perl -npe " +
-
"'s|^(\\s*(noSSLS|s)erverURL\\s*=\\s*[^:]+://)[^/]*/|${1}" +
+
"'s|^(\\s*(noSSLS\\|s)erverURL\\s*=\\s*[^:]+://)[^/]*/|${1}" +
up2datehost +
"/|' -i /etc/sysconfig/rhn/rhn_register" + NEWLINE);
}
// both rhel 2 and rhel3/4 need the following
retval.append("perl -npe " +
-
"'s|^(\\s*(noSSLS|s)erverURL\\s*=\\s*[^:]+://)[^/]*/|\\${1}" +
+
"'s|^(\\s*(noSSLS\\|s)erverURL\\s*=\\s*[^:]+://)[^/]*/|\\${1}" +
up2datehost +
"/|' -i /etc/sysconfig/rhn/up2date" + NEWLINE);