backend/server/repomd/mapper.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bd4c10f6b40c5efbc1a13b09154cd8585d4e3d41
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
package timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File
"/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line
333, in get_repomd_file
...
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnCache.py", line
259, in has_key
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line
84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '201105241737360400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index ed5c7ce..7fd79e6 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -334,7 +334,7 @@ class SqlPackageMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnPackage
where id = :package_id
commit 15d3b2a318457b6f357f6e847bff46f4b6abea8f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
errata timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File
"/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line
348, in get_repomd_file
...
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line
84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '20110523182837.3651460400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index 7d68007..ed5c7ce 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -547,7 +547,7 @@ class SqlErratumMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnErrata
where id = :erratum_id
commit b01640638157ba057e1d5e57fe1e4606e73561e9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:47:18 2011 +0200
fixed table aliases
fixing
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py",
line 269, in _execute_wrapper
raise rhnSQL.SQLStatementPrepareError(0, str(e), self.sql)
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('missing FROM-clause
entry for table "pr"\nLINE 28: pr.sense,\n
^\n', 0, "\n select\n 'provides',\n
pp.sense,\n pc.name,\n pc.version\n from\n
rhnPackageCapability pc,\n rhnPackageProvides pp\n where\n
pp.package_id = %(package_id)s\n and pp.capability_id = pc.id\n union
all\n select\n 'requires',\n pr.sense,\n
pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n
rhnPackageRequires pr\n where\n pr.package_id = %(package_id)s\n
and pr.capability_id = pc.id\n union all\n select\n
'recommends',\n pr.sense,\n pc.name,\n pc.version\n
from\n rhnPackageCapability pc,\n rhnPackageRecommends prec\n
where\n prec.package_id = %(package_id)s\n and prec.capability_id
= pc.id\n union all\n select\n 'supplements',\n
pr.sense,\n pc.name,\n pc.version\n from\n
rhnPackageCapability pc,\n rhnPackageSupplements supp\n where\n
supp.package_id = %(package_id)s\n and supp.capability_id = pc.id\n union
all\n select\n 'suggests',\n pr.sense,\n
pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n
rhnPackageSuggests sugg\n where\n sugg.package_id = %(package_id)s\n
and sugg.capability_id = pc.id\n union all\n select\n
'conflicts',\n pcon.sense,\n pc.name,\n pc.version\n
from\n rhnPackageCapability pc,\n rhnPackageConflicts pcon\n
where\n pcon.package_id = %(package_id)s\n and pcon.capability_id
= pc.id\n union all\n select\n 'obsoletes',\n
po.sense,\n pc.name,\n pc.version\n from\n
rhnPackageCapability pc,\n rhnPackageObsoletes po\n where\n
po.package_id = %(package_id)s\n and po.capability_id = pc.id\n ")
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index abf322d..7d68007 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -273,7 +273,7 @@ class SqlPackageMapper:
union all
select
'recommends',
- pr.sense,
+ prec.sense,
pc.name,
pc.version
from
@@ -285,7 +285,7 @@ class SqlPackageMapper:
union all
select
'supplements',
- pr.sense,
+ supp.sense,
pc.name,
pc.version
from
@@ -297,7 +297,7 @@ class SqlPackageMapper:
union all
select
'suggests',
- pr.sense,
+ sugg.sense,
pc.name,
pc.version
from
commit bb86448d7f2734e4d775cbd2d77a3d9d6a349107
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
channel timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File
"/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line
333, in get_repomd_file
...
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnCache.py", line
259, in has_key
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line
84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '201105231718140400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index 8d5f962..abf322d 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -62,7 +62,7 @@ class ChannelMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnChannel
where id = :channel_id