Changes to 'refs/tags/spacewalk-schema-1.8.70-1'
by Michael Mraka
Tag 'spacewalk-schema-1.8.70-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-10 12:10 +0000
Tagging package [spacewalk-schema] version [1.8.70-1] in directory [schema/spacewalk/].
Changes since rhn-virtualization-5.4.40-1:
Michael Mraka (5):
843374 - make list of newest packages unique
fixed indentation
843374 - upgrade script for rhnChannelNewestPackageView
843374 - fixed subquery in FROM must have an alias
Automatic commit of package [spacewalk-schema] release [1.8.70-1].
Milan Zazrivec (1):
847276 - pull http proxy settings from up2date conf.
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/rhnChannelNewestPackageView.sql | 58 +++++-----
schema/spacewalk/spacewalk-schema.spec | 7 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql | 56 +++++++++
spacewalk/setup/bin/spacewalk-setup | 17 ++
spacewalk/setup/lib/Spacewalk/Setup.pm | 3
6 files changed, 116 insertions(+), 27 deletions(-)
---
11 years, 9 months
5 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/rhnChannelNewestPackageView.sql | 58 +++++-----
schema/spacewalk/spacewalk-schema.spec | 7 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql | 56 +++++++++
4 files changed, 96 insertions(+), 27 deletions(-)
New commits:
commit 79b24325ec84a00b6b2591afc7a3cf8d60fbbda1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 10 14:10:52 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.70-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 8f298a9..0128278 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.69-1 schema/spacewalk/
+1.8.70-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 72a2c47..edcbd0f 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.69
+Version: 1.8.70
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Aug 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.70-1
+- 843374 - fixed subquery in FROM must have an alias
+- 843374 - upgrade script for rhnChannelNewestPackageView
+- 843374 - make list of newest packages unique
+
* Tue Jul 31 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.69-1
- fix PG upgrade script
commit ad4647ef6281e83fa27d5ca0c4850a7365461f24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 10 14:06:43 2012 +0200
843374 - fixed subquery in FROM must have an alias
diff --git a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
index b35f80f..7100b32 100644
--- a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
@@ -51,7 +51,7 @@ FROM (
AND p.evr_id = pe.id
AND chp.package_id = p.id
AND chp.channel_id = m.channel_id
-)
+) latest_packages
group by channel_id, name_id, evr_id, package_arch_id
;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql
index 4a00c0a..f845d2f 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql
@@ -51,6 +51,6 @@ FROM (
AND p.evr_id = pe.id
AND chp.package_id = p.id
AND chp.channel_id = m.channel_id
-)
+) latest_packages
group by channel_id, name_id, evr_id, package_arch_id
;
commit 342fda667bf9eaa6c04458958954c49ab6abebd7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 10 14:02:44 2012 +0200
843374 - upgrade script for rhnChannelNewestPackageView
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql
new file mode 100644
index 0000000..4a00c0a
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/123-rhnChannelNewestPackageView.sql
@@ -0,0 +1,56 @@
+--
+-- 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
+-- 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.
+--
+--
+--
+--
+-- this is much more readable with ts=4, enjoy!
+
+create or replace view
+rhnChannelNewestPackageView
+as
+SELECT channel_id,
+ name_id,
+ evr_id,
+ package_arch_id,
+ max(package_id) as package_id
+FROM (
+ SELECT m.channel_id as channel_id,
+ p.name_id as name_id,
+ p.evr_id as evr_id,
+ m.package_arch_id as package_arch_id,
+ p.id as package_id
+ FROM
+ (select max(pe.evr) AS max_evr,
+ cp.channel_id,
+ p.name_id,
+ p.package_arch_id
+ from rhnPackageEVR pe,
+ rhnPackage p,
+ rhnChannelPackage cp
+ where p.evr_id = pe.id
+ and cp.package_id = p.id
+ group by cp.channel_id, p.name_id, p.package_arch_id) m,
+ rhnPackageEVR pe,
+ rhnPackage p,
+ rhnChannelPackage chp
+ WHERE m.max_evr = pe.evr
+ AND m.name_id = p.name_id
+ AND m.package_arch_id = p.package_arch_id
+ AND p.evr_id = pe.id
+ AND chp.package_id = p.id
+ AND chp.channel_id = m.channel_id
+)
+group by channel_id, name_id, evr_id, package_arch_id
+;
commit a4505264511ff975fa64599ed04789300d47fdf2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 10 14:00:06 2012 +0200
fixed indentation
diff --git a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
index ad6c755..b35f80f 100644
--- a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
@@ -26,31 +26,31 @@ SELECT channel_id,
package_arch_id,
max(package_id) as package_id
FROM (
-SELECT m.channel_id as channel_id,
- p.name_id as name_id,
- p.evr_id as evr_id,
- m.package_arch_id as package_arch_id,
- p.id as package_id
-FROM
- (select max(pe.evr) AS max_evr,
- cp.channel_id,
- p.name_id,
- p.package_arch_id
- from rhnPackageEVR pe,
- rhnPackage p,
- rhnChannelPackage cp
- where p.evr_id = pe.id
- and cp.package_id = p.id
- group by cp.channel_id, p.name_id, p.package_arch_id) m,
- rhnPackageEVR pe,
- rhnPackage p,
- rhnChannelPackage chp
-WHERE m.max_evr = pe.evr
-AND m.name_id = p.name_id
-AND m.package_arch_id = p.package_arch_id
-AND p.evr_id = pe.id
-AND chp.package_id = p.id
-AND chp.channel_id = m.channel_id
+ SELECT m.channel_id as channel_id,
+ p.name_id as name_id,
+ p.evr_id as evr_id,
+ m.package_arch_id as package_arch_id,
+ p.id as package_id
+ FROM
+ (select max(pe.evr) AS max_evr,
+ cp.channel_id,
+ p.name_id,
+ p.package_arch_id
+ from rhnPackageEVR pe,
+ rhnPackage p,
+ rhnChannelPackage cp
+ where p.evr_id = pe.id
+ and cp.package_id = p.id
+ group by cp.channel_id, p.name_id, p.package_arch_id) m,
+ rhnPackageEVR pe,
+ rhnPackage p,
+ rhnChannelPackage chp
+ WHERE m.max_evr = pe.evr
+ AND m.name_id = p.name_id
+ AND m.package_arch_id = p.package_arch_id
+ AND p.evr_id = pe.id
+ AND chp.package_id = p.id
+ AND chp.channel_id = m.channel_id
)
group by channel_id, name_id, evr_id, package_arch_id
;
commit e8cb44dfbf3d9f5cd6d673335cc932894d5cabf3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 10 13:55:49 2012 +0200
843374 - make list of newest packages unique
there can be two packages with the same NEVRA but different checksum
diff --git a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
index 2f497cb..ad6c755 100644
--- a/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
+++ b/schema/spacewalk/common/views/rhnChannelNewestPackageView.sql
@@ -20,6 +20,12 @@
create or replace view
rhnChannelNewestPackageView
as
+SELECT channel_id,
+ name_id,
+ evr_id,
+ package_arch_id,
+ max(package_id) as package_id
+FROM (
SELECT m.channel_id as channel_id,
p.name_id as name_id,
p.evr_id as evr_id,
@@ -45,5 +51,7 @@ AND m.package_arch_id = p.package_arch_id
AND p.evr_id = pe.id
AND chp.package_id = p.id
AND chp.channel_id = m.channel_id
+)
+group by channel_id, name_id, evr_id, package_arch_id
;
11 years, 9 months
spacewalk/setup
by Milan Zazrivec
spacewalk/setup/bin/spacewalk-setup | 17 +++++++++++++++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 3 +++
2 files changed, 20 insertions(+)
New commits:
commit 17753cf308746b81ca205a6052cb2ce1b6ddc9a8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 10 13:53:02 2012 +0200
847276 - pull http proxy settings from up2date conf.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index f4d0ba4..aedd638 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -67,6 +67,23 @@ if (-e Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION) {
\%rhnOptions);
}
+my %up2dateOptions = ();
+if (-e Spacewalk::Setup::DEFAULT_UP2DATE_LOCATION) {
+ Spacewalk::Setup::read_config(Spacewalk::Setup::DEFAULT_UP2DATE_LOCATION,
+ \%up2dateOptions);
+
+ if ($up2dateOptions{'enableProxy'}) {
+ $answers{'rhn-http-proxy'} = $up2dateOptions{'httpProxy'}
+ if not defined $answers{'rhn-http-proxy'};
+ if ($up2dateOptions{'enableProxyAuth'}) {
+ $answers{'rhn-http-proxy-username'} = $up2dateOptions{'proxyUser'}
+ if not defined $answers{'rhn-http-proxy-username'};
+ $answers{'rhn-http-proxy-password'} = $up2dateOptions{'proxyPassword'}
+ if not defined $answers{'rhn-http-proxy-password'};
+ }
+ }
+}
+
choose_database_schema(\%answers);
# If Oracle was selected, call the Oracle specific setup script. If it turns
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 2698458..39814d9 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -48,6 +48,9 @@ use constant DEFAULT_ANSWER_FILE_GLOB =>
use constant DEFAULT_RHN_CONF_LOCATION =>
'/etc/rhn/rhn.conf';
+use constant DEFAULT_UP2DATE_LOCATION =>
+ '/etc/sysconfig/rhn/up2date';
+
use constant DEFAULT_RHN_ETC_DIR =>
'/etc/sysconfig/rhn';
11 years, 9 months
Changes to 'refs/tags/rhn-virtualization-5.4.40-1'
by Milan Zazrivec
Tag 'rhn-virtualization-5.4.40-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2012-08-10 11:40 +0000
Tagging package [rhn-virtualization] version [5.4.40-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-setup-1.8.16-1:
Milan Zazrivec (2):
fix file inclusion on a fedora build
Automatic commit of package [rhn-virtualization] release [5.4.40-1].
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 7 +++++--
rel-eng/packages/rhn-virtualization | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 9 months
client/tools rel-eng/packages
by Milan Zazrivec
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
rel-eng/packages/rhn-virtualization | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ab313c909546d81b715cc243f3505d5c03dec741
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 10 13:40:13 2012 +0200
Automatic commit of package [rhn-virtualization] release [5.4.40-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 2cc73d9..c6e4bb5 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.39
+Version: 5.4.40
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -151,6 +151,9 @@ fi
%doc LICENSE
%changelog
+* Fri Aug 10 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 5.4.40-1
+- fix file inclusion on a fedora build
+
* Fri Aug 10 2012 Jan Pazdziora 5.4.39-1
- 820862 - fix traceback on a fat rhev-3 host
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 1824f6f..20d9b47 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.39-1 client/tools/rhn-virtualization/
+5.4.40-1 client/tools/rhn-virtualization/
11 years, 9 months
client/tools
by Milan Zazrivec
client/tools/rhn-virtualization/rhn-virtualization.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ab169309ba1f69ba25d3a1a1415016a81f272694
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 10 13:39:38 2012 +0200
fix file inclusion on a fedora build
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 3fd62ca..2cc73d9 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -143,7 +143,7 @@ fi
%{rhn_dir}/virtualization/support.py*
%{rhn_dir}/actions/virt.py*
%{rhn_dir}/actions/image.py*
-%if 0%{?suse_version} || (0%{?rhel} && 0%{?rhel} < 6)
+%if 0%{?fedora} || 0%{?suse_version} || (0%{?rhel} && 0%{?rhel} < 6)
%{rhn_dir}/virtualization/localvdsm.py*
%endif
%{rhn_conf_dir}/studio-*-template.xml
11 years, 9 months
Changes to 'refs/tags/spacewalk-setup-1.8.16-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.8.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-10 11:21 +0000
Tagging package [spacewalk-setup] version [1.8.16-1] in directory [spacewalk/setup/].
Changes since spacewalk-java-1.8.127-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.8.16-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 9 months
Changes to 'refs/tags/spacewalk-java-1.8.127-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.127-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-10 11:20 +0000
Tagging package [spacewalk-java] version [1.8.127-1] in directory [java/].
Changes since spacecmd-1.8.12-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.127-1].
---
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
11 years, 9 months
Changes to 'refs/tags/spacecmd-1.8.12-1'
by Jan Pazdziora
Tag 'spacecmd-1.8.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-10 11:20 +0000
Tagging package [spacecmd] version [1.8.12-1] in directory [spacecmd/].
Changes since rhn-virtualization-5.4.39-1:
Jan Pazdziora (1):
Automatic commit of package [spacecmd] release [1.8.12-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 9 months
Changes to 'refs/tags/rhn-virtualization-5.4.39-1'
by Jan Pazdziora
Tag 'rhn-virtualization-5.4.39-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-10 11:20 +0000
Tagging package [rhn-virtualization] version [5.4.39-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-utils-1.8.25-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-virtualization] release [5.4.39-1].
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
rel-eng/packages/rhn-virtualization | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 9 months