4 commits - backend/server
by Michael Mraka
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
12 years, 11 months
rel-eng/tito.props
by Miroslav Suchý
rel-eng/tito.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 54fdb7b519b013bda22fa6fe4b7d8a49493d6466
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 25 09:53:22 2011 +0200
block python-hwdata
we are upstream, but there is no need to build every release (if there will be some) in Spacewalk.
it can go directly to Fedora and then to EPEL.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index a7a1e26..4879b25 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -9,12 +9,12 @@ autobuild_tags = dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1
[dist-5E-sw-1.5-candidate]
disttag = .el5
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
[dist-6E-sw-1.5-candidate]
disttag = .el6
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools jabberd-selinux apt-spacewalk
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools jabberd-selinux apt-spacewalk python-hwdata
[dist-f14-sw-1.5-candidate]
disttag = .fc14
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.13-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-web] version [1.5.13-1] in directory [web/].
Changes since spacewalk-schema-1.5.5-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.13-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c746c159f499e1ef94936353e73807b498dce039
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:56 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8a6bd0d..8b0b19a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.12-1 web/
+1.5.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e63c925..8c8a669 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.12
+Version: 1.5.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.13-1
+- replaced (+) with ANSI left join (je(a)rockenstein.de)
+
* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.12-1
- made queries PostgreSQL compatible
12 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.5.5-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.5.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-schema] version [1.5.5-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.5.35-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.5.5-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c98f32d31ac536d9f6c7bb3e4d3c18ff8be9e5c8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:35 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3f11fb7..dc49e88 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.5.4-1 schema/spacewalk/
+1.5.5-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fa35ed9..d5cc026 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.5-1
+- 679333 - update rhnPushClient when deleting server (mzazrivec(a)redhat.com)
+
* Wed Apr 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.4-1
- in postgres we should upgrade only the affected function
12 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.5.35-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.35-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-java] version [1.5.35-1] in directory [java/].
Changes since spacewalk-backend-1.5.28-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.35-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e2ce3d0cf22e59fb5fc29941f4b1ab78d5146c2f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:10 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.35-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a633e18..d3e1159 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.34
+Version: 1.5.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.35-1
+- 703273 - check, whether subscription is possible (tlestach(a)redhat.com)
+
* Fri May 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.34-1
- 659138 - extend schedule creation error handling (tlestach(a)redhat.com)
- 659138 - do not forward parameter map in case of success
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b523448..4d8632c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.34-1 java/
+1.5.35-1 java/
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.28-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:58 +0000
Tagging package [spacewalk-backend] version [1.5.28-1] in directory [backend/].
Changes since rhn-client-tools-1.5.8-1:
Jan Pazdziora (2):
We need to specifically check for None when calling decode.
Automatic commit of package [spacewalk-backend] release [1.5.28-1].
---
backend/server/importlib/packageImport.py | 2 ++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 90ed91246181c5bf20b89e5e2666860affbc1b5d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:58:30 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.28-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bfd4ebe..6ec0c84 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.5.27
+Version: 1.5.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.28-1
+- We need to specifically check for None when calling decode.
+
* Fri May 20 2011 Jan Pazdziora 1.5.27-1
- Removing %{pythonrhnroot}/common/UserDictCase.py* from %files.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 30004c1..b8df06b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.27-1 backend/
+1.5.28-1 backend/
12 years, 11 months