3 commits - spacewalk/setup
by Milan Zazrivec
spacewalk/setup/bin/spacewalk-setup-jabberd | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e218e2bf3438d0eb98742782a7e6b78252f675c1
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 11:19:21 2009 +0200
localize $/
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 1d6c275..92a78a5 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -52,7 +52,7 @@ foreach my $basename ('c2s', 's2s', 'sm') {
my $template = Spacewalk::Setup::SHARED_DIR . "/jabberd/$basename.xsl";
{
- $/ = undef;
+ local $/ = undef;
print Spacewalk::Setup::loc("Calling /usr/bin/xsltproc $template $configfile...\n") if $verbose;
my $transformed = `/usr/bin/xsltproc $template $configfile`;
commit 75e0b5b36e4c334798475274bad09a81524797e3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 11:18:43 2009 +0200
Show what's actually being called during transformation
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 17adc8e..1d6c275 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -54,7 +54,7 @@ foreach my $basename ('c2s', 's2s', 'sm') {
{
$/ = undef;
- print Spacewalk::Setup::loc("Processing $configfile...\n") if $verbose;
+ print Spacewalk::Setup::loc("Calling /usr/bin/xsltproc $template $configfile...\n") if $verbose;
my $transformed = `/usr/bin/xsltproc $template $configfile`;
die "There was an error running xsltproc\n" if $?;
commit 7e18e329567f2ec04ea48fd87c6e8e567824105b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Sep 1 11:17:03 2009 +0200
substitute macros before comparing results
Macro subsitution in transformed xml document needs to be done
before we actually compare the original and resulting document.
diff --git a/spacewalk/setup/bin/spacewalk-setup-jabberd b/spacewalk/setup/bin/spacewalk-setup-jabberd
index 55d2e04..17adc8e 100755
--- a/spacewalk/setup/bin/spacewalk-setup-jabberd
+++ b/spacewalk/setup/bin/spacewalk-setup-jabberd
@@ -63,14 +63,14 @@ foreach my $basename ('c2s', 's2s', 'sm') {
my $original = <F>;
close F;
+ for my $key (keys %macros) {
+ $transformed =~ s/\@$key\@/$macros{$key}/mg;
+ }
+
if ($transformed ne $original) {
print Spacewalk::Setup::loc("$configfile has been backed up to $configfile-swsave\n") if $verbose;
system('cp', '-p', '--backup=numbered', $configfile, "$configfile-swsave");
- for my $key (keys %macros) {
- $transformed =~ s/\@$key\@/$macros{$key}/mg;
- }
-
my @statistics = stat($configfile);
open F, ">$configfile";
14 years, 7 months