rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c45d633e5c07a7893ffbea906e97b0903a2ff55f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:15:29 2010 +0200
Automatic commit of package [spacewalk-utils] release [1.2.7-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index a0c91f7..3edd7af 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.2.6-1 utils/
+1.2.7-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 620f586..320627d 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.2.6
+Version: 1.2.7
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.7-1
+- fixed spacewalk-common-channels
+- updated spacewalk-common-channels to Spacewalk 1.1 and Fedora 13 and 14
+
* Tue Oct 26 2010 Jan Pazdziora 1.2.6-1
- Blobs (byteas) want double backslashes and octal values.
13 years, 6 months
4 commits - utils/spacewalk-common-channels utils/spacewalk-common-channels.ini
by Michael Mraka
utils/spacewalk-common-channels | 10 --
utils/spacewalk-common-channels.ini | 167 ++++++++++++++++++++----------------
2 files changed, 99 insertions(+), 78 deletions(-)
New commits:
commit 0fa04e3a7800041ad83b57db51f6e2ac77820f07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:12:47 2010 +0200
spacewalk gpgkey_{url,id,fingerprint} defined as macro
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index b30c560..fd2e4a5 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -30,6 +30,9 @@ gpgkey_fingerprint = %(base_channel_gpgkey_fingerprint)s
_f12_archs = i386, x86_64, ppc
_x86_archs = i386, x86_64
_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
+_spacewalk_gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
+_spacewalk_gpgkey_id = 430A1C35
+_spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
[fedora12]
checksum = sha256
@@ -242,27 +245,27 @@ yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arc
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1/RHEL/5/%(arch)s/
[spacewalk11-server-fedora12]
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1/Fedora/12/%(arch)s/
[spacewalk11-server-fedora13]
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora13-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
@@ -270,26 +273,26 @@ yumrepo_url = http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/RHEL/5/%(arch)s/
[spacewalk11-client-fedora12]
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/Fedora/12/%(arch)s/
[spacewalk11-client-fedora13]
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora13-%(arch)s
-gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/Fedora/13/%(arch)s/
commit 54b6f15a6b046b4e4a49ebdd00973a9b3b8fd858
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:06:06 2010 +0200
updated spacewalk channels to 1.1, removed Fedora 11, added Fedora 13
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index fb6520e..b30c560 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -238,58 +238,58 @@ gpgkey_id = 217521F6
gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6
yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arch)s
-[spacewalk08-server-centos5]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-centos5]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8/RHEL/5/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1/RHEL/5/%(arch)s/
-[spacewalk08-server-fedora11]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-fedora12]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora11-%(arch)s
+base_channels = fedora12-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8/Fedora/11/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1/Fedora/12/%(arch)s/
-[spacewalk08-server-fedora12]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-fedora13]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = fedora13-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8/Fedora/12/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
-[spacewalk08-client-centos5]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-centos5]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8-client/RHEL/5/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/RHEL/5/%(arch)s/
-[spacewalk08-client-fedora11]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-fedora12]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora11-%(arch)s
+base_channels = fedora12-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8-client/Fedora/11/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/Fedora/12/%(arch)s/
-[spacewalk08-client-fedora12]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-fedora13]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = fedora13-%(arch)s
gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url = http://spacewalk.redhat.com/yum/0.8-client/Fedora/12/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.1-client/Fedora/13/%(arch)s/
commit b7f48e32f98973aa93ce25966525eaa497c85ee8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:01:59 2010 +0200
removed Fedora 11 added Fedora 13 and 14 channels
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 53ad8f6..fb6520e 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -26,39 +26,11 @@ gpgkey_url = %(base_channel_gpgkey_url)s
gpgkey_id = %(base_channel_gpgkey_id)s
gpgkey_fingerprint = %(base_channel_gpgkey_fingerprint)s
## now define some "macros"
-#_f11_archs = i386, x86_64, ppc, ppc64, s390x, sparc, sparc64
-_f11_archs = i386, x86_64, ppc, s390x, sparc
#_f12_archs = i386, x86_64, ppc, ppc64
_f12_archs = i386, x86_64, ppc
_x86_archs = i386, x86_64
_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
-[fedora11]
-checksum = sha256
-archs = %(_f11_archs)s
-checksum = sha256
-name = Fedora 11 (%(arch)s)
-gpgkey_url = http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i38...
-gpgkey_id = D22E77F2
-gpgkey_fingerprint = AEE4 0C04 E345 60A7 1F04 3D7C 1DC5 C758 D22E 77F2
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-11&arch=%(arch)s
-
-[fedora11-updates]
-label = %(base_channel)s-updates
-name = Fedora 11 Updates (%(arch)s)
-archs = %(_f11_archs)s
-checksum = sha256
-base_channels = fedora11-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f11&arch...
-
-[fedora11-debug]
-label = %(base_channel)s-debug
-name = Fedora 11 Debug (%(arch)s)
-archs = %(_f11_archs)s
-checksum = sha256
-base_channels = fedora11-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-11&arch=%(ar...
-
[fedora12]
checksum = sha256
archs = %(_f12_archs)s
@@ -85,6 +57,58 @@ checksum = sha256
base_channels = fedora12-%(arch)s
yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-12&arch=%(ar...
+[fedora13]
+checksum = sha256
+archs = %(_x86_archs)s
+checksum = sha256
+name = Fedora 13 (%(arch)s)
+gpgkey_url = http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i38...
+gpgkey_id = E8E40FDE
+gpgkey_fingerprint = 8E5F 73FF 2A18 1765 4D35 8FCA 7EDC 6AD6 E8E4 0FDE
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-13&arch=%(arch)s
+
+[fedora13-updates]
+label = %(base_channel)s-updates
+name = Fedora 13 Updates (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora13-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f13&arch...
+
+[fedora13-debug]
+label = %(base_channel)s-debug
+name = Fedora 13 Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora13-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-13&arch=%(ar...
+
+[fedora14]
+checksum = sha256
+archs = %(_x86_archs)s
+checksum = sha256
+name = Fedora 14 (%(arch)s)
+gpgkey_url = http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i38...
+gpgkey_id = 97A1071F
+gpgkey_fingerprint = 235C 2936 B4B7 0E61 B373 A020 421C ADDB 97A1 071F
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-14&arch=%(arch)s
+
+[fedora14-updates]
+label = %(base_channel)s-updates
+name = Fedora 14 Updates (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora14-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f14&arch...
+
+[fedora14-debug]
+label = %(base_channel)s-debug
+name = Fedora 14 Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora14-%(arch)s
+yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-14&arch=%(ar...
+
[centos5]
archs = %(_x86_archs)s
name = CentOS 5 (%(arch)s)
commit 6f9adadfe9052ec9511dacac8d5a67bef258666a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 15:08:49 2010 +0200
repo creation has been removed from channel.software.create
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 61eea36..9a14f00 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -228,10 +228,7 @@ Create everything as well as unlimited activation key for every channel:
channel_arch[base_info['arch']], '', base_info['checksum'],
{ 'url': base_info['gpgkey_url'],
'id' : base_info['gpgkey_id'],
- 'fingerprint': base_info['gpgkey_fingerprint']},
- { 'url': base_info['yumrepo_url'],
- 'label': 'X',
- 'sync': False})
+ 'fingerprint': base_info['gpgkey_fingerprint']})
except xmlrpclib.Fault, e:
if e.faultCode != 1200: # ignore if channel exists
sys.stderr.write("ERROR: %s: %s\n" % (
@@ -287,10 +284,7 @@ Create everything as well as unlimited activation key for every channel:
child_info['checksum'],
{ 'url': child_info['gpgkey_url'],
'id' : child_info['gpgkey_id'],
- 'fingerprint': child_info['gpgkey_fingerprint']},
- { 'url': child_info['yumrepo_url'],
- 'label': 'X',
- 'sync': False})
+ 'fingerprint': child_info['gpgkey_fingerprint']})
except xmlrpclib.Fault, e:
if e.faultCode != 1200: # ignore if channel exists
sys.stderr.write("ERROR: %s: %s\n" % (
13 years, 6 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnSnapshotPackage.sql | 6 +-----
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/273-rhnSnapshotPackage-indexes.sql | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 0d3a4e927f582cfe87494ce2fce5f237de46b3ab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 15:07:31 2010 +0200
We have rhn_snapshotpkg_sid_nid_uq, no need to have another index on column snapshot_id.
diff --git a/schema/spacewalk/common/tables/rhnSnapshotPackage.sql b/schema/spacewalk/common/tables/rhnSnapshotPackage.sql
index b3d491c..00494fa 100644
--- a/schema/spacewalk/common/tables/rhnSnapshotPackage.sql
+++ b/schema/spacewalk/common/tables/rhnSnapshotPackage.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -27,10 +27,6 @@ CREATE TABLE rhnSnapshotPackage
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_snapshotpkg_sid
- ON rhnSnapshotPackage (snapshot_id)
- TABLESPACE [[8m_tbs]];
-
CREATE UNIQUE INDEX rhn_snapshotpkg_sid_nid_uq
ON rhnSnapshotPackage (snapshot_id, nevra_id)
TABLESPACE [[32m_tbs]];
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/273-rhnSnapshotPackage-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/273-rhnSnapshotPackage-indexes.sql
new file mode 100644
index 0000000..7e26584
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/273-rhnSnapshotPackage-indexes.sql
@@ -0,0 +1,3 @@
+
+drop index rhn_snapshotpkg_sid ;
+
13 years, 6 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnServerProfile.sql | 7 +------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/272-rhnServerProfile-indexes.sql | 3 +++
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit e5510999877a92cd4b8c2fb865bdadbab4f5baad
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:58:38 2010 +0200
We have rhn_sprofile_id_oid_bc_idx and rhn_server_profile_noid_uq, so rhn_server_profile_o_id_bc_idx is not useful, removing.
diff --git a/schema/spacewalk/common/tables/rhnServerProfile.sql b/schema/spacewalk/common/tables/rhnServerProfile.sql
index b1b737e..bac521a 100644
--- a/schema/spacewalk/common/tables/rhnServerProfile.sql
+++ b/schema/spacewalk/common/tables/rhnServerProfile.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -46,11 +46,6 @@ CREATE INDEX rhn_sprofile_id_oid_bc_idx
ON rhnServerProfile (id, org_id, base_channel)
TABLESPACE [[64k_tbs]];
-CREATE INDEX rhn_server_profile_o_id_bc_idx
- ON rhnServerProfile (org_id, id, base_channel)
- TABLESPACE [[64k_tbs]]
- NOLOGGING;
-
CREATE INDEX rhn_server_profile_bc_idx
ON rhnServerProfile (base_channel)
TABLESPACE [[64k_tbs]]
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/272-rhnServerProfile-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/272-rhnServerProfile-indexes.sql
new file mode 100644
index 0000000..50c938b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/272-rhnServerProfile-indexes.sql
@@ -0,0 +1,3 @@
+
+drop index rhn_server_profile_o_id_bc_idx ;
+
13 years, 6 months
2 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql | 45 --
schema/spacewalk/oracle/packages/rhn_channel.pkb | 4
schema/spacewalk/oracle/packages/rhn_channel.pks | 97 -----
schema/spacewalk/oracle/procs/delete_server.sql | 3
schema/spacewalk/oracle/procs/procs.deps | 3
schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql | 25 -
schema/spacewalk/postgres/packages/rhn_channel.pkb | 1
schema/spacewalk/postgres/procs/delete_server.sql | 1
schema/spacewalk/postgres/procs/procs.deps | 3
schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql | 18 -
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql | 97 -----
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql | 165 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql | 4
14 files changed, 4 insertions(+), 465 deletions(-)
New commits:
commit c4ee53cef24c8c10d5d879e35f171959834a816b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:34:06 2010 +0200
Clearing the ancient changelogs for rhn_channel.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 76064bc..096c001 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE BODY rhn_channel
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pks b/schema/spacewalk/oracle/packages/rhn_channel.pks
index f0d4634..fc73c02 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pks
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pks
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE rhn_channel
@@ -147,97 +144,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.37 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.36 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.35 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.34 2003/11/13 18:13:09 cturner
--- pragmas can now return now that rhn_user pragmas are fixed
---
--- Revision 1.32 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.31 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.30 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.29 2003/07/24 14:00:17 misa
--- bugzilla: none PRAGMA RESTRICT_REFERENCES good
---
--- Revision 1.28 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.27 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.26 2002/12/19 18:13:42 misa
--- Added caller with a default value
---
--- Revision 1.25 2002/12/11 22:18:46 pjones
--- rhnChannelNewestPackage
---
--- Revision 1.24 2002/11/21 22:08:11 pjones
--- make unsubscribe_channels have a "unsubscribe_children_in number := 0"
--- argument so that you can tell it to unsubscribe children.
---
--- Also, make it raise an exception instead of silent failure in the
--- other case.
---
--- Revision 1.23 2002/11/18 17:20:50 pjones
--- this should have gone back too
---
--- Revision 1.22 2002/11/13 23:16:18 pjones
--- lookup_*_arch()
---
--- Revision 1.21 2002/10/07 20:01:59 rnorwood
--- guess base channel for ssm and single system
---
--- Revision 1.20 2002/10/02 19:21:03 bretm
--- o 3rd party channel schema changes, no more clobs...
---
--- Revision 1.19 2002/09/20 19:21:58 bretm
--- o more 3rd party channel stuff...
---
--- Revision 1.18 2002/06/12 22:33:03 pjones
--- procedure bulk_guess_server_base_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- channel_id_in in number);
---
--- for bretm
---
--- Revision 1.17 2002/06/12 22:12:25 pjones
--- procedure bulk_guess_server_base(
--- set_label_in in varchar2,
--- set_uid_in in number);
---
--- for bretm
---
--- Revision 1.16 2002/06/12 19:37:55 pjones
--- bulk_server_basechange_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- old_channel_id_in in number,
--- new_channel_id_in in number
--- );
---
--- for bretm
---
--- Revision 1.15 2002/05/10 22:08:22 pjones
--- id/log
---
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
index f0d4634..fc73c02 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE rhn_channel
@@ -147,97 +144,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.37 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.36 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.35 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.34 2003/11/13 18:13:09 cturner
--- pragmas can now return now that rhn_user pragmas are fixed
---
--- Revision 1.32 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.31 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.30 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.29 2003/07/24 14:00:17 misa
--- bugzilla: none PRAGMA RESTRICT_REFERENCES good
---
--- Revision 1.28 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.27 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.26 2002/12/19 18:13:42 misa
--- Added caller with a default value
---
--- Revision 1.25 2002/12/11 22:18:46 pjones
--- rhnChannelNewestPackage
---
--- Revision 1.24 2002/11/21 22:08:11 pjones
--- make unsubscribe_channels have a "unsubscribe_children_in number := 0"
--- argument so that you can tell it to unsubscribe children.
---
--- Also, make it raise an exception instead of silent failure in the
--- other case.
---
--- Revision 1.23 2002/11/18 17:20:50 pjones
--- this should have gone back too
---
--- Revision 1.22 2002/11/13 23:16:18 pjones
--- lookup_*_arch()
---
--- Revision 1.21 2002/10/07 20:01:59 rnorwood
--- guess base channel for ssm and single system
---
--- Revision 1.20 2002/10/02 19:21:03 bretm
--- o 3rd party channel schema changes, no more clobs...
---
--- Revision 1.19 2002/09/20 19:21:58 bretm
--- o more 3rd party channel stuff...
---
--- Revision 1.18 2002/06/12 22:33:03 pjones
--- procedure bulk_guess_server_base_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- channel_id_in in number);
---
--- for bretm
---
--- Revision 1.17 2002/06/12 22:12:25 pjones
--- procedure bulk_guess_server_base(
--- set_label_in in varchar2,
--- set_uid_in in number);
---
--- for bretm
---
--- Revision 1.16 2002/06/12 19:37:55 pjones
--- bulk_server_basechange_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- old_channel_id_in in number,
--- new_channel_id_in in number
--- );
---
--- for bretm
---
--- Revision 1.15 2002/05/10 22:08:22 pjones
--- id/log
---
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
index b0a8b10..096c001 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE BODY rhn_channel
@@ -1216,164 +1213,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.75 2005/03/04 00:04:19 jslagle
--- bz #147617
--- Made Red Hat Desktop sort a little better.
---
--- Revision 1.74 2005/02/22 03:24:47 jslagle
--- bz #147617
--- Improve channel_priority function to order channels better.
---
--- Revision 1.73 2004/08/16 20:39:30 pjones
--- bugzilla: 129889 -- make bulk_server_basechange_from() actually work.
---
--- Revision 1.72 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.71 2004/04/13 16:28:36 bretm
--- bugzilla: 119871
---
--- keep track of rhnServer.channels_changed through the pl/sql fns
---
--- Revision 1.70 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.69 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.68 2004/02/17 20:05:38 pjones
--- bugzilla: 115782 -- make bulk_server_basechange_from() filter out servers
--- with arches incompatible with the target channel
---
--- Revision 1.67 2004/02/06 02:36:10 misa
--- Changed normalize_server_arch to allow for solaris arches
---
--- Revision 1.66 2003/11/13 16:58:34 cturner
--- make use of new rhn_user.check_role_implied call; pragmas broke, removed them for now since I have no idea how to fix them
---
--- Revision 1.65 2003/10/23 20:26:24 bretm
--- bugzilla: none
---
--- note the channel label when we unsubscribe, too
---
--- Revision 1.64 2003/10/15 14:47:17 bretm
--- bugzilla: none
---
--- add the channel label to the server history summary line when we log a channel change
---
--- Revision 1.63 2003/09/24 19:25:56 pjones
--- this wasn't the right fix, put it back
---
--- Revision 1.62 2003/09/24 17:42:19 pjones
--- bugzilla: none
---
--- limit our server base channel guess to channels with available permissions
---
--- Revision 1.61 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.60 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.59 2003/08/21 13:41:17 cturner
--- bugzilla: 99187. properly test for satellite and proxy in bulk_guess_server_base; reorg code for better reuse
---
--- Revision 1.58 2003/07/24 16:46:22 cturner
--- bugzilla: 100723, the perm check was returning duplicates, so now it just calls the function it should have called anyway
---
--- Revision 1.57 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.56 2003/07/23 22:36:51 cturner
--- argh, max returns null even when now rows; use distinct. how revolting
---
--- Revision 1.55 2003/07/23 22:01:31 cturner
--- oops, this one can return multiple rows; eliminate that in a lazy way
---
--- Revision 1.54 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.53 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.52 2003/07/14 22:19:29 misa
--- bugzilla: none Updating guess_base_channel to work more like the rhnapp server code
---
--- Revision 1.51 2003/06/26 22:09:04 pjones
--- bugzilla: none
---
--- log subscribe and unsubscribe
---
--- Revision 1.50 2003/06/05 19:31:15 pjones
--- bugzilla: 88278 -- make the cursor name smaller
---
--- Revision 1.49 2003/06/05 19:18:21 pjones
--- bugzilla: 88278
---
--- unsubscribe_server() opens the package-level cursor when it invokes itself,
--- so we're using a local copy instead.
---
--- Revision 1.48 2003/06/04 16:41:39 pjones
--- bugzilla: none
---
--- make bulk_guess_server_base() silently ignore unguessables
---
--- Revision 1.47 2003/06/04 16:27:03 pjones
--- bugzilla: 88822
---
--- eliminate the last outliers that remove things from channels without using
--- unsubscribe_server, I think.
---
--- Revision 1.46 2003/06/03 20:49:37 pjones
--- bugzilla: 88822
--- unsubscribing from rhn-satellite now clears rhnSatelliteChannelFamily
--- for the server in question
---
--- Revision 1.45 2003/06/02 20:41:45 pjones
--- bugzilla: none - fix rhnProxyInfo/rhnSatelliteInfo channel unsubscribe
--- problem. Basicly, if you're out of the channel for any reason, you're
--- also out of rhnProxyInfo/rhnProxyInfo
---
--- Revision 1.44 2003/03/24 15:26:28 pjones
--- bugzilla: 85812
---
--- bulk_server_base_change silently ignores servers that are satellites
--- or proxies, as requested.
---
--- Revision 1.43 2003/02/26 20:28:17 pjones
--- rhn_channel.update_family_counts() in rhn_channel.entitle_customer()
--- the old codepath is:
---
--- ep ->
--- rhn_ep.entitlement_run_me() ->
--- rhn_ep.poll_customer() ->
--- rhn_channel.entitle_customer()
---
--- which doesn't change current_members, even though it may remove servers
--- from the family.
---
--- There's another bug here: currently, we don't try to order forced
--- unsubscribes in any way; we just use
--- rhn_channel.unsubscribe_server_from_family . If there are any child
--- channel subscriptions, this will leave them subscribed. We really need
--- to iterate across the channels again, and subscribe any channel for which
--- there are no parent channel subscriptions.
---
--- Ugh.
---
--- Revision 1.42 2003/01/28 00:19:45 pjones
--- fix clear_subscriptions; AFAICT, this is only hit on the
--- bulk_server_base_change / bulk_server_base_guess codepaths, which puts
--- it infrequent enough that it could be our "bad count" culprit.
---
--- Revision 1.41 2003/01/14 19:51:45 pjones
--- make setting current_members on rhnChannelFamilyPermissions work when
--- a server is in more than one channel in a single family.
commit a5f54a14e92a5fa2d8dc2afd56bedcc03ebb863c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:28:48 2010 +0200
Removing rhnSatelliteChannelFamily as it is no longer referenced.
diff --git a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql b/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index dd523ac..0000000
--- a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,45 +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 rhnSatelliteChannelFamily
-(
- server_id NUMBER NOT NULL
- CONSTRAINT rhn_sat_cf_sid_fk
- REFERENCES rhnServer (id),
- channel_family_id NUMBER NOT NULL
- CONSTRAINT rhn_sat_cf_cfid_fk
- REFERENCES rhnChannelFamily (id)
- ON DELETE CASCADE,
- quantity NUMBER,
- created DATE
- DEFAULT (sysdate) NOT NULL,
- modified DATE
- DEFAULT (sysdate) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE INDEX rhn_sat_cf_sid_cfid_idx
- ON rhnSatelliteChannelFamily (server_id, channel_family_id)
- TABLESPACE [[2m_tbs]];
-
-CREATE INDEX rhn_sat_cf_cfid_idx
- ON rhnSatelliteChannelFamily (channel_family_id)
- TABLESPACE [[2m_tbs]];
-
-ALTER TABLE rhnSatelliteChannelFamily
- ADD CONSTRAINT rhn_sat_cf_sid_cfid_uq UNIQUE (server_id, channel_family_id);
-
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 4270c67..76064bc 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -538,7 +538,6 @@ IS
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git a/schema/spacewalk/oracle/procs/delete_server.sql b/schema/spacewalk/oracle/procs/delete_server.sql
index b9cdbae..c9abd56 100644
--- a/schema/spacewalk/oracle/procs/delete_server.sql
+++ b/schema/spacewalk/oracle/procs/delete_server.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps
index b2f3ee8..ae75ee2 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2010 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
@@ -35,7 +35,6 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
diff --git a/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql b/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index 50cc3bd..0000000
--- a/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,25 +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 or replace trigger
-rhn_sat_cf_mod_trig
-before insert or update on rhnSatelliteChannelFamily
-for each row
-begin
- :new.modified := sysdate;
-end;
-/
-show errors
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 306af77..f483af5 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -506,7 +506,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql
index 9c1b5c7..2c01408 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 9bd6db4..84aeead 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2010 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
@@ -35,7 +35,6 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
diff --git a/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql b/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index 2da1541..0000000
--- a/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- oracle equivalent source sha1 248736eb9b98094c630afcc108f9ad63382d20a6
--- retrieved from ./1241102873/cdc6d42049bf86fbc9f1d3a5c54275eeacbd641d/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
-create or replace function rhn_sat_cf_mod_trig_fun() returns trigger as
-$$
-begin
- new.modified := current_timestamp;
-
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_sat_cf_mod_trig
-before insert or update on rhnSatelliteChannelFamily
-for each row
-execute procedure rhn_sat_cf_mod_trig_fun();
-
-
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
index b9cdbae..c9abd56 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
index 6df3c55..b0a8b10 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
@@ -538,7 +538,6 @@ IS
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
deleted file mode 100644
index ef204c1..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE INDEX rhn_sat_cf_cfid_idx
- ON rhnSatelliteChannelFamily (channel_family_id)
- TABLESPACE [[2m_tbs]];
-drop index rhn_sat_cf_cfid_sid_idx;
13 years, 6 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/tables.deps | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2d3a78a397f02f0dfef0f96366980ef897a4a5f0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:18:22 2010 +0200
Fixing dependencies for rhnRepoRegenQueue.
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index 1578249..85e9e53 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2010 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
@@ -138,7 +138,6 @@ rhnRegTokenConfigChannels :: rhnRegToken rhnConfigChannel
rhnRegTokenEntitlement :: rhnRegToken rhnServerGroupType
rhnRegTokenGroups :: rhnRegToken rhnServerGroup
rhnRegTokenPackages :: rhnRegToken rhnPackageName
-rhnRepoRegenQueue :: rhnSatelliteCert rhnSatelliteChannelFamily rhnSatelliteInfo
rhnSatelliteInfo :: rhnServer
rhnServer :: rhnServerArch web_contact web_customer \
13 years, 6 months
2 commits - java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 15 ----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 31 ----------
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 15 ----
3 files changed, 61 deletions(-)
New commits:
commit d7dc012f485cbd63b97c3ea06e77ddcf34aa3299
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:14:18 2010 +0200
Operations on rhnSatelliteChannelFamily are not longer called, removing the queries.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 7437492..7f64745 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1559,27 +1559,12 @@ INSERT INTO rhnSatelliteInfo (server_id, cert, product, owner, issued_string, e
</query>
</write-mode>
-<write-mode name="insert_satellite_channel_family">
- <query params="sid, channel_family_label, quantity">
-INSERT INTO rhnSatelliteChannelFamily
- (server_id, channel_family_id, quantity)
-VALUES
- (:sid, (SELECT id FROM rhnChannelFamily WHERE label = :channel_family_label), :quantity)
- </query>
-</write-mode>
-
<write-mode name="delete_satellite_info">
<query params="sid">
DELETE FROM rhnSatelliteInfo WHERE server_id = :sid
</query>
</write-mode>
-<write-mode name="delete_satellite_channel_family">
- <query params="sid">
-DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
- </query>
-</write-mode>
-
<callable-mode name="remove_from_action">
<query params="server_id, action_id">
{call rhn_server.remove_action(:server_id, :action_id)}
commit f623e5b73e0a889fe23f77bfafa3adb614b25e80
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:11:52 2010 +0200
Method deactivateSatellite not used (presumably hosted only), removing.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index b5d99d8..8b9f31f 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1498,37 +1498,6 @@ public class SystemManager extends BaseManager {
}
/**
- * Deactivate a current satellite
- * @param server the current satellite to be deactivated
- * @throws NotActivatedSatelliteException <code>server</code> is not a satellite
- * @throws NoSuchSystemException thrown if the server is null.
- */
- public static void deactivateSatellite(Server server)
- throws NotActivatedSatelliteException, NoSuchSystemException {
- if (server == null) {
- throw new NoSuchSystemException();
- }
-
- if (!server.isSatellite()) {
- throw new NotActivatedSatelliteException();
- }
-
- Map params = new HashMap();
- params.put("sid", server.getId());
- executeWriteMode("System_queries", "delete_satellite_info", params);
- executeWriteMode("System_queries", "delete_satellite_channel_family", params);
-
- Set channels = server.getChannels();
- for (Iterator itr = channels.iterator(); itr.hasNext();) {
- Channel c = (Channel)itr.next();
- ChannelFamily cf = c.getChannelFamily();
- if (cf.getLabel().equals("rhn-satellite")) {
- SystemManager.unsubscribeServerFromChannel(server, c);
- }
- }
- }
-
- /**
* Entitles the given server to the given Entitlement.
* @param server Server to be entitled.
* @param ent Level of Entitlement.
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
index 85d451b..7a81437 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
@@ -882,21 +882,6 @@ public class SystemManagerTest extends RhnBaseTestCase {
assertNotEmpty(dr);
}
- public void testDeactivateSatellite() throws Exception {
- // Server s = ServerFactory.lookupById(new Long(1007294616));
- Server s = ServerTestUtils.createTestSystem();
- flushAndEvict(s);
- s = (Server) reload(s);
- assertNotNull(s);
- try {
- SystemManager.deactivateSatellite(s);
- fail("Should have thrown an NotActivatedSatelliteException");
- }
- catch (Exception e) {
- // do nothing
- }
- }
-
public void testDeactivateProxy() throws Exception {
User user = UserTestUtils.findNewUser(TestStatics.TESTUSER, TestStatics.TESTORG);
user.addRole(RoleFactory.ORG_ADMIN);
13 years, 6 months
3 commits - java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 43 -----
java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java | 73 ----------
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 37 -----
3 files changed, 153 deletions(-)
New commits:
commit 90f0e1fa95bddd2da4b76350ab472b2deb006bb3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:04:15 2010 +0200
Queries channel_download_categories_by_type and satellite_channel_download_categories_by_type not used after previous removal, removing.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 8b6511e..3082157 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -189,26 +189,6 @@ ORDER BY C.parent_channel NULLS LAST, UPPER(C.name)
</mode>
-<mode name="channel_download_categories_by_type" class="com.redhat.rhn.frontend.dto.ISOCategory">
- <query params="channel_label, download_type, org_id">
-SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
- FROM rhnDownloads RD,
- rhnDownloadType DT,
- rhnAvailableChannels AC,
- rhnChannelDownloads CD,
- rhnChannel C
- WHERE AC.org_id = :org_id
- AND RD.id = CD.downloads_id
- AND CD.channel_id = C.id
- AND C.label = :channel_label
- AND C.id = AC.channel_id
- AND DT.id = RD.download_type
- AND DT.label = :download_type
-GROUP BY RD.category
-ORDER BY MIN(ordering)
- </query>
-</mode>
-
<mode name="channel_downloads_by_type" class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="channel_label, download_type, org_id" >
SELECT RD.name AS DOWNLOAD_NAME,
@@ -244,29 +224,6 @@ SELECT FL.file_id id, FL.location LOCATIONS
</mode>
-<mode name="satellite_channel_download_categories_by_type" class="com.redhat.rhn.frontend.dto.ISOCategory">
- <query params="channel_label, download_type, org_id">
-SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
- FROM rhnDownloads RD,
- rhnDownloadType DT,
- rhnSatelliteChannelFamily SCF,
- rhnServer S,
- rhnChannelDownloads CD,
- rhnChannel C
- WHERE S.org_id = :org_id
- AND S.id = SCF.server_id
- AND RD.id = CD.downloads_id
- AND CD.channel_id = C.id
- AND C.label = :channel_label
- AND RD.channel_family_id = SCF.channel_family_id
- AND DT.id = RD.download_type
- AND DT.label = :download_type
-GROUP BY RD.category
-ORDER BY MIN(ordering)
- </query>
-</mode>
-
-
<mode name="satellite_channel_downloads_by_type" class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="org_id, channel_label, download_type">
SELECT DISTINCT RF.id AS ID,
commit a6468917729223a3111cc6f83b3cfd44dcf24953
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:02:50 2010 +0200
ISOCategory not referenced, removing.
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java b/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java
deleted file mode 100644
index b84cea5..0000000
--- a/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2009--2010 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.
- */
-package com.redhat.rhn.frontend.dto;
-
-
-/**
- * ISOCategory - handles DataResult return from
- * channel_queries.channel_download_categories_by_type
- * @version $Rev$
- */
-public class ISOCategory extends BaseDto {
- private String category;
- private Long minOrder;
-
- /**
- * {@inheritDoc}
- */
- public Long getId() {
- return minOrder;
- }
-
- /**
- * Get the category-name
- * @return category
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * Set category-name
- * @param cat category-name to set
- */
- public void setCategory(String cat) {
- category = cat;
- }
-
- /**
- * Get smallest ordering-number for thall ISOs i nthis category
- * @return min-order
- */
- public Long getMinOrder() {
- return minOrder;
- }
-
- /**
- * Set min-order
- * @param min minOrder to set
- */
- public void setMinOrder(Long min) {
- minOrder = min;
- }
-
- /**
- * Set an ID for this category
- * @param newId new id
- */
- public void setId(Long newId) {
- this.minOrder = newId;
- }
-}
commit 175cf2ed1f9c4cb1e4436996226656e1542dd638
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:02:17 2010 +0200
The listDownloadCategories is not used, removing.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 47d1002..31ef700 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1817,43 +1817,6 @@ public class ChannelManager extends BaseManager {
}
/**
- * Return a list of categories available for download
- * @param u User making the request
- * @param channelLabel channel to download from
- * @param downloadType download-type to look for (typically "iso")
- * @param lc associated list-control (if any)
- * @param forSatellite true if we want satellite-related categories
- * @return DataResult<ISOCategory>
- */
- public static DataResult listDownloadCategories(
- User u,
- String channelLabel, String downloadType, ListControl lc,
- boolean forSatellite) {
- SelectMode m = null;
-
- if (forSatellite) {
- m = ModeFactory.getMode("Channel_queries",
- "satellite_channel_download_categories_by_type");
- }
- else {
- m = ModeFactory.getMode("Channel_queries",
- "channel_download_categories_by_type");
- }
-
- Map params = new HashMap();
- params.put("org_id", u.getOrg().getId());
- params.put("channel_label", channelLabel);
- params.put("download_type", downloadType);
- DataResult dr = makeDataResult(params, params, lc, m);
- if (dr.size() == 0) {
- return null;
- }
- else {
- return dr;
- }
- }
-
- /**
* Return a list of all downlaods available for download from the specified channel
* @param u User making the request
* @param channelLabel label of channel of interest
13 years, 6 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnPackageNEVRA.sql | 6 +-----
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/271-rhnPackageNEVRA-indexes.sql | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit c4fa0901e158f378e8cbdecabe6a34e13801aa55
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 13:49:13 2010 +0200
No need to have index which includes column which is in primary key and the first two which are in rhn_pkgnevra_nid_eid_paid_uq.
diff --git a/schema/spacewalk/common/tables/rhnPackageNEVRA.sql b/schema/spacewalk/common/tables/rhnPackageNEVRA.sql
index f82707e..6a70b69 100644
--- a/schema/spacewalk/common/tables/rhnPackageNEVRA.sql
+++ b/schema/spacewalk/common/tables/rhnPackageNEVRA.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -32,10 +32,6 @@ CREATE TABLE rhnPackageNEVRA
ENABLE ROW MOVEMENT
;
-CREATE INDEX rhn_pkgnevra_nid_evrid_id_idx
- ON rhnPackageNEVRA (name_id, evr_id, id)
- TABLESPACE [[32m_tbs]];
-
CREATE SEQUENCE rhn_pkgnevra_id_seq;
ALTER TABLE rhnPackageNEVRA
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/271-rhnPackageNEVRA-indexes.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/271-rhnPackageNEVRA-indexes.sql
new file mode 100644
index 0000000..a86420e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/271-rhnPackageNEVRA-indexes.sql
@@ -0,0 +1,3 @@
+
+drop index rhn_pkgnevra_nid_evrid_id_idx ;
+
13 years, 6 months
Changes to 'refs/tags/spacewalk-web-1.2.19-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.2.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-29 11:13 +0000
Tagging package [spacewalk-web] version [1.2.19-1] in directory [web/].
Changes since spacewalk-backend-1.2.45-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.2.19-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
13 years, 6 months