rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/configchannel.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 8853f045db4249954267bfc8e7a3959b277bf0cf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:46:03 2013 +0100
Automatic commit of package [spacecmd] release [2.1.20-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index b26103f..6a3e09f 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.19-1 spacecmd/
+2.1.20-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 228f54d..3b81360 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.19
+Version: 2.1.20
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
+* Fri Dec 13 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.20-1
+- 1009841 - don't attempt to write out 'None'
+
* Fri Dec 13 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.19-1
- 960984 - fix system listing when identified by system id
commit dea26dd6f4ffc1f86655274b536d4d041237194e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:44:14 2013 +0100
1009841 - don't attempt to write out 'None'
This is to fix the following error:
ERROR: argument 1 must be string or read-only character buffer, not None
Traceback (most recent call last):
File "/usr/bin/spacecmd", line 133, in ?
shell.print_result(shell.onecmd( precmd ), precmd)
File "/usr/lib64/python2.4/cmd.py", line 219, in onecmd
return func(arg)
File "/usr/lib/python2.4/site-packages/spacecmd/configchannel.py",
line 270, in do_configchannel_backup
of.write( details.get('contents') )
TypeError: argument 1 must be string or read-only character buffer, not None
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 5153d3f..59a9bcc 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -267,7 +267,7 @@ def do_configchannel_backup(self, args):
fh.write( 'md5 = %s\n' % details.get('md5') )
fh.write( 'binary = %s\n' % details.get('binary') )
of = open( dumpfile, 'w' )
- of.write( details.get('contents') )
+ of.write( details.get('contents') or '' )
of.close()
fh.write( '\n' )