backend/satellite_tools/reposync.py | 4 ++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 82a0ce38a0af56b2eb835c4479c8db87e9917593
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 14:43:16 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.1-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8cf17e8..cc32476 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.1-1
+- 860860 - release and title are optional in older updateinfo version
+
* Tue Oct 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.84-1
- removing unused backend code
- backend changes
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 84587a4..d720ac0 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.84-1 backend/
+1.9.1-1 backend/
commit 9d9fffa018e46233baf02e3b35ef7cc63337a7ed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 14:38:07 2012 +0100
860860 - release and title are optional in older updateinfo version
fixing
Traceback (most recent call last):
File "/usr/bin/spacewalk-repo-sync", line 100, in <module>
sys.exit(abs(main() or 0))
File "/usr/bin/spacewalk-repo-sync", line 93, in main
sync.sync()
File
"/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/reposync.py", line
101, in sync
self.import_updates(plugin, url)
File
"/usr/lib/python2.6/site-packages/spacewalk/satellite_tools/reposync.py", line
129, in import_updates
self.upload_updates(notices)
...
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py",
line 318, in _executemany
self._real_cursor.executemany(self.sql, all_kwargs)
psycopg2.IntegrityError: null value in column "product" violates not-null
constraint
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 0685be4..d7c9a37 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -203,9 +203,9 @@ class RepoSync(object):
e['advisory_name'] = notice['update_id']
e['advisory_rel'] = notice['version']
e['advisory_type'] = typemap.get(notice['type'], 'Product
Enhancement Advisory')
- e['product'] = notice['release']
+ e['product'] = notice['release'] or 'Unknown'
e['description'] = notice['description']
- e['synopsis'] = notice['title']
+ e['synopsis'] = notice['title'] or
notice['update_id']
e['topic'] = ' '
e['solution'] = ' '
e['issue_date'] = self._to_db_date(notice['issued'])