rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/system.py | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-)

New commits: commit 7c5454d0c737658b7cfd8527ee7ab67bc652a3ec Author: Milan Zazrivec mzazrivec@redhat.com Date: Sun Dec 1 11:24:45 2013 +0100

Automatic commit of package [spacecmd] release [2.1.16-1].

diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index d3152de..9c9f5df 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.15-1 spacecmd/ +2.1.16-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index d5a419b..22df27c 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif

Name: spacecmd -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers

@@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz

%changelog +* Sun Dec 01 2013 Milan Zazrivec mzazrivec@redhat.com 2.1.16-1 +- 835979 - don't double convert start time 'now' + * Fri Nov 29 2013 Michael Mraka michael.mraka@redhat.com 2.1.15-1 - Making code more "pythonic"

commit ddcaf0a5df86f3377f2698ce4641d8df5c4b702c Author: Milan Zazrivec mzazrivec@redhat.com Date: Sun Dec 1 11:23:54 2013 +0100

835979 - don't double convert start time 'now'

diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py index 31fde5c..820681b 100644 --- a/spacecmd/src/lib/system.py +++ b/spacecmd/src/lib/system.py @@ -364,8 +364,10 @@ def do_system_runscript(self, args): options.timeout = 600 else: options.timeout = int(options.timeout) - if not options.start_time: options.start_time = parse_time_input('now') - options.start_time = parse_time_input(options.start_time) + if not options.start_time: + options.start_time = parse_time_input('now') + else: + options.start_time = parse_time_input(options.start_time)

if not options.file: logging.error('A script file is required')