rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 32a187c50917cdb07cb6f76adcf74b9d6801a810 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Feb 28 14:29:48 2012 +0100
Automatic commit of package [spacewalk-setup] release [1.7.8-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index d33bd10..8a22ca4 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.7.7-1 spacewalk/setup/ +1.7.8-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 545cb83..953699e 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.7.7 +Version: 1.7.8 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man8/spacewalk-make-mount-points*
%changelog +* Tue Feb 28 2012 Miroslav Suchý 1.7.8-1 +- do not ignore missing answer-file (msuchy@redhat.com) + * Tue Feb 28 2012 Jan Pazdziora 1.7.7-1 - Make sure /etc/cobbler/settings has 644.
commit 01ac3a25e8ec52f6dc676d395c854bd8a3b857ba Author: Miroslav Suchý msuchy@redhat.com Date: Tue Feb 28 14:28:21 2012 +0100
do not ignore missing answer-file
if it is missing we want to print error message and exit
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index b32e7dd..f2b2a7c 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -171,7 +171,7 @@ sub load_answer_file {
for my $file (@files) {
- next unless -r $file; + next unless (-r $file or $file eq $options->{'answer-file'});
if ($options->{'answer-file'} and $file eq $options->{'answer-file'}) { print loc("* Loading answer file: %s.\n", $file);