backend/server/rhnDependency.py | 18 +++++++++---------
backend/server/rhnSQL/driver_cx_Oracle.py | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 71f06a1a3f547f438d5c93bd8d84dcc3f00f15ce
Merge: 4ab5729... 207518c...
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Jun 25 19:08:40 2010 -0400
Merge branch 'master' into fve
commit 207518cf37a3e9c909b279f7ec49c049e4c45b21
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jun 24 14:37:40 2010 +0200
do need to check date, we can get anything
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py
b/backend/server/rhnSQL/driver_cx_Oracle.py
index dba0a32..4ea0096 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -482,7 +482,7 @@ class Database(sql_base.Database):
def check_connection(self):
try:
- h = self.prepare("select sysdate as ID from dual")
+ h = self.prepare("select 1 from dual")
h.execute()
except: # try to reconnect, that one MUST WORK always
log_error("DATABASE CONNECTION TO '%s' LOST" % self.dbtxt,
commit 23d5fa8a83df5898cf88a4f7bb941d754bda7974
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jun 24 14:06:19 2010 +0200
evr should be parsed from the end
addressing incorectly parsing of packages with - in name. eg:
>> rhnDependency.make_evr(systemtap-runtime-0.5.12-1)
{'release': '0.5.12', 'epoch': None, 'version':
'runtime', 'name': 'systemtap'}
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 111f088..a7be48c 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -339,18 +339,18 @@ def make_evr(nvre):
if string.find(holder[0], '-') != -1:
holder[0] = string.split(holder[0], '-')
ret = {
- 'name' : holder[0][0],
- 'version' : holder[0][1],
- 'release' : holder[0][2],
+ 'name' : '-'.join(holder[0][:-2]),
+ 'version' : holder[0][-2],
+ 'release' : holder[0][-1],
'epoch' : holder[1]
}
return ret
elif string.find(holder[1], '-') != -1:
holder[1] = string.split(holder[1], '-')
ret = {
- 'name' : holder[1][0],
- 'version' : holder[1][1],
- 'release' : holder[1][2],
+ 'name' : '-'.join(holder[1][:-2]),
+ 'version' : holder[1][-2],
+ 'release' : holder[1][-1],
'epoch' : holder[0]
}
return ret
@@ -360,9 +360,9 @@ def make_evr(nvre):
elif string.find(nvre, '-') != -1:
nvre = string.split(nvre, '-')
ret = {
- 'name' : nvre[0],
- 'version' : nvre[1],
- 'release' : nvre[2],
+ 'name' : '-'.join(nvre[:-2]),
+ 'version' : nvre[-2],
+ 'release' : nvre[-1],
'epoch' : None
}
return ret