backend/server/rhnSQL/driver_postgresql.py | 6 ++----
backend/spacewalk-backend.spec | 10 +++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 9c905a36ea783ee0a1291d08e0d62c4faca1d1c5
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Oct 27 16:19:34 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.2.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 56c9dfb..c5f1ad4 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.2.40
+Version: 1.2.41
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -670,6 +670,14 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 27 2010 Lukas Zapletal 1.2.41-1
+- Fixing typo in driver_postgresql.py
+- Class ReleaseChannelMapImport does not seem to be called, removing.
+- fixed NameError: name 'SourcePackageImport' is not defined
+- removed redundant empty tagMaps
+- reused load_sql
+- XXX: not used currently; removing
+
* Wed Oct 27 2010 Lukas Zapletal 1.2.40-1
- In PostgreSQL NUMERIC types are returned as int or float now
- Rewritten DECODE to ANSI CASE-WHEN syntax for yum
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f70e4bc..59a0030 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.40-1 backend/
+1.2.41-1 backend/
commit ab0bbb0a1e78d9c8d85d54bd18081b20dc2e75d0
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Oct 27 12:45:55 2010 +0200
Fixing typo in driver_postgresql.py
diff --git a/backend/server/rhnSQL/driver_postgresql.py
b/backend/server/rhnSQL/driver_postgresql.py
index 960ff74..d707990 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -21,6 +21,7 @@ import sys
import re
import psycopg2
import hashlib
+import decimal
import sql_base
from spacewalk.server import rhnSQL
@@ -114,9 +115,6 @@ def decimal2intfloat(dec, cursor):
except decimal.Inexact:
# if not exact return float
return float(dec)
- except:
- # if anything bad happends return float as well
- return float(dec)
finally:
decimal.setcontext(oldcontext)
@@ -152,7 +150,7 @@ class Database(sql_base.Database):
self.dbh = psycopg2.connect(database=self.database, user=self.username,
password=self.password, host=self.host,
port=self.port)
# convert all DECIMAL types to float (let Python to choose one)
- DEC2INTFLOAT =
psycopg2.extensions.new_type(psycopg2.extensions.DECIMAL.values,
+ DEC2INTFLOAT =
psycopg2.extensions.new_type(psycopg2._psycopg.DECIMAL.values,
'DEC2INTFLOAT',
decimal2intfloat)
psycopg2.extensions.register_type(DEC2INTFLOAT)
except Exception, e: