rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/kickstart.py | 7 ++++++- 3 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 9e0975c70150721c380a5c91e02482e0c89293a2 Author: Aron Parsons aronparsons@gmail.com Date: Sun Apr 28 17:09:16 2013 -0400
Automatic commit of package [spacecmd] release [1.10.4-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index d979842..2b96e5c 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -1.10.3-1 spacecmd/ +1.10.4-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index f1f10a9..e19fd06 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif
Name: spacecmd -Version: 1.10.3 +Version: 1.10.4 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers
@@ -60,6 +60,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz
%changelog +* Sun Apr 28 2013 Aron Parsons aronparsons@gmail.com 1.10.4-1 +- 947829 - spacecmd errors out when trying to add script to kickstart + * Fri Apr 26 2013 Michael Mraka michael.mraka@redhat.com 1.10.3-1 - provide support for user.setDetails()
commit 35dcec453a66520666ba29bbc4432c23b28773f7 Author: Aron Parsons aronparsons@gmail.com Date: Sun Apr 28 17:08:35 2013 -0400
947829 - spacecmd errors out when trying to add script to kickstart
options.template wasn't being set in non-interactive mode
diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py index ddb4fc8..adcdaca 100644 --- a/spacecmd/src/lib/kickstart.py +++ b/spacecmd/src/lib/kickstart.py @@ -1637,7 +1637,8 @@ options: -e EXECUTION_TIME ['pre', 'post'] -i INTERPRETER -f FILE - -c execute in a chroot environment''' + -c execute in a chroot environment + -t ENABLING_TEMPLATING'''
def complete_kickstart_addscript(self, text, line, beg, end): parts = line.split(' ') @@ -1708,6 +1709,10 @@ def do_kickstart_addscript(self, args): if not options.interpreter: options.interpreter = '/bin/bash'
+ if not options.template: + options.template = False + + if options.file: options.contents = read_file(options.file)
spacewalk-commits@lists.fedorahosted.org