backend/server/handlers/xmlrpc/registration.py
| 6
backend/server/rhnMapping.py
| 17 -
backend/spacewalk-backend.spec
| 5
rel-eng/packages/spacewalk-backend
| 2
rel-eng/packages/spacewalk-schema
| 2
schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
| 103 ----------
schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
| 29 --
schema/spacewalk/spacewalk-schema.spec
| 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
| 1
9 files changed, 13 insertions(+), 157 deletions(-)
New commits:
commit e1727cc23553819846ca191a9a8c6a252a17c1ea
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:35:09 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.33-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 06ada4c..51f7e94 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.32
+Version: 1.8.33
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -663,6 +663,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.33-1
+- removed support for Red Hat Linux 6.2 and 7.[0123]
+
* Tue Jun 05 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.32-1
- fix wrong transaction name in unsubscribe_channels (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 47a341d..f5489c4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.32-1 backend/
+1.8.33-1 backend/
commit 2d7efe49a5d581066f1f29ea2989bf34b3741158
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:34:49 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.48-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index c0d22a1..061657a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.47-1 schema/spacewalk/
+1.8.48-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec
b/schema/spacewalk/spacewalk-schema.spec
index 5f5bba3..90a56e8 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.8.47
+Version: 1.8.48
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Jun 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.48-1
+- removed support for Red Hat Linux 6.2 and 7.[0123]
+
* Mon Jun 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.47-1
- Add support for studio image deployments (DB files) (jrenner(a)suse.de)
commit 7a15834a36718af23c7ee87e82053c81a53176b1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:31:47 2012 +0200
remove rhnRedHatCanonVersion table during upgrade
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
new file mode 100644
index 0000000..d7ee39f
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
@@ -0,0 +1 @@
+drop table rhnRedHatCanonVersion;
commit 6beed96a227502a44a5cbf3f04cf3de1b47072d5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:29:33 2012 +0200
real_version() has been removed
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index aa55dea..0c8f0b5 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -25,7 +25,6 @@ from spacewalk.common.rhnTranslate import _, cat
from spacewalk.common.rhnLib import checkValue
from spacewalk.server.rhnLib import normalize_server_arch
from spacewalk.server.rhnServer import server_route, server_lib
-from spacewalk.server.rhnMapping import real_version
from spacewalk.server.rhnHandler import rhnHandler
from spacewalk.server import rhnUser, rhnServer, rhnSQL, rhnCapability, \
rhnChannel, rhnVirtualization
@@ -250,7 +249,7 @@ class Registration(rhnHandler):
else:
up2date_uuid = None
- release = real_version(release_version)
+ release = str(release_version)
if data.has_key('token'):
token_string = data['token']
@@ -822,8 +821,7 @@ class Registration(rhnHandler):
# we need to load the user because we will generate a new certificate
self.load_user = 1
server = self.auth_system(system_id)
- # real_version will fix it, as well as stringify it for us
- newver = real_version(newver)
+ newver = str(newver)
if not newver:
raise rhnFault(21, _("Invalid system release version requested"))
#log the entry
commit a37a5d10ee4d87c833520b7033ac61e66bc85d7e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:26:19 2012 +0200
removed support for Red Hat Linux 6.2 and 7.[0123]
diff --git a/backend/server/rhnMapping.py b/backend/server/rhnMapping.py
index e39a571..b757fef 100644
--- a/backend/server/rhnMapping.py
+++ b/backend/server/rhnMapping.py
@@ -15,22 +15,6 @@
from spacewalk.server import rhnSQL
-# maps a funky product release to something that is canonical
-# and has a chance of hitting some channels
-def real_version(version):
- version = str(version)
-
- h = rhnSQL.prepare("""
- select canon_version
- from rhnRedHatCanonVersion rhcv
- where rhcv.version = :version
- """)
- h.execute(version = version)
- ret = h.fetchone_dict()
- if not ret:
- return version
- return ret["canon_version"]
-
# checks if an arch is for real
def check_package_arch(name):
name = str(name)
@@ -47,6 +31,5 @@ if __name__ == '__main__':
"""Test code.
"""
rhnSQL.initDB()
- print real_version('7.1sbe')
print check_package_arch('i386')
diff --git a/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
b/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
deleted file mode 100644
index 1176929..0000000
--- a/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
+++ /dev/null
@@ -1,103 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
--- data for rhnRedHatCanonVersion
-
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.1' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_7.1' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1sbe' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0.91' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0.95' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.90' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.91' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.93' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.95' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0j' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0J' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.1J' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 6.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_6.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_6.1' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2EE' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2de' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2fr' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2es' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2it' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2ja' , '6.2');
-
--- and now for the junk mappings...
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.2' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.2 i386' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'redhat-linux-i686-7.0' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_7.2' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2-1' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.98' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.90' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.90EE' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.91AS' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.93' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.94' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.2.93' , '7.3');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.2.94' , '7.3');
-
-commit;
-
---
--- Revision 1.2 2002/05/06 02:59:46 misa
--- Added the beta channels
---
--- Revision 1.1 2002/03/08 23:01:05 pjones
--- split imports out into seperate files
---
diff --git a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
b/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
deleted file mode 100644
index 2874e7e..0000000
--- a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
+++ /dev/null
@@ -1,29 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhnRedHatCanonVersion
-(
- version VARCHAR2(32) NOT NULL
- CONSTRAINT rhn_rh_canon_ver_v_pk PRIMARY KEY,
- canon_version VARCHAR2(32) NOT NULL,
- created DATE
- DEFAULT (sysdate) NOT NULL,
- modified DATE
- DEFAULT (sysdate) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-