backend/satellite_tools/satCerts.py | 2 +- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit c984ad2b4780aac7aec2ebbaac86dd310d4f11be Author: Miroslav Suchý msuchy@redhat.com Date: Mon Aug 15 09:43:38 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.8-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 7314468..eba92ff 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.6.7 +Version: 1.6.8 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -672,6 +672,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Mon Aug 15 2011 Miroslav Suchý 1.6.8-1 +- make satCerts.py work on PostgreSQL + * Fri Aug 12 2011 Miroslav Suchý 1.6.7-1 - add missing import - sys
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index af2211b..4894661 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.6.7-1 backend/ +1.6.8-1 backend/
commit 7692fe587856bb528081bd3def202647eb6b20b5 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Aug 15 09:42:07 2011 +0200
make satCerts.py work on PostgreSQL
Contributed by: George Nikandrov https://www.redhat.com/archives/spacewalk-devel/2011-August/msg00031.html
Addressing: rhn-ssl-dbstore -vvv --ca-cert /root/ssl-build/RHN-ORG-TRUSTED-SSL-CERT fails with quite obvious python traceback.
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py index 2a66d34..ab22811 100644 --- a/backend/satellite_tools/satCerts.py +++ b/backend/satellite_tools/satCerts.py @@ -421,7 +421,7 @@ def _checkCertMatch_rhnCryptoKey(caCert, description, org_id, deleteRowYN=0, ## NUKE IT! if deleteRowYN: #print 'found a cert, nuking it! id:', rhn_cryptokey_id - h = rhnSQL.prepare('delete rhnCryptoKey where id=:rhn_cryptokey_id') + h = rhnSQL.prepare('delete from rhnCryptoKey where id=:rhn_cryptokey_id') h.execute(rhn_cryptokey_id=rhn_cryptokey_id) #rhnSQL.commit() rhn_cryptokey_id = -1
spacewalk-commits@lists.fedorahosted.org