Changes to 'refs/tags/spacewalk-schema-1.6.15-1'
by Michael Mraka
Tag 'spacewalk-schema-1.6.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-09-09 14:57 +0000
Tagging package [spacewalk-schema] version [1.6.15-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.6.16-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-schema] release [1.6.15-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 8 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2c724f047e36aee47960e1c0ee8b7af81d4031a0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 9 16:57:35 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.15-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index f144d55..31d4360 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.14-1 schema/spacewalk/
+1.6.15-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 404cccc..5784f42 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.6.14
+Version: 1.6.15
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.15-1
+- added EPEL to the list of package providers
+- added rpm signing keys for F15, CentOS 6, Scientfic Linux 6 and EPEL
+
* Wed Sep 07 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.14-1
- create constraints out of table so new and upgraded schemas are equal
12 years, 8 months
Changes to 'refs/tags/spacewalk-backend-1.6.16-1'
by Michael Mraka
Tag 'spacewalk-backend-1.6.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-09-09 14:56 +0000
Tagging package [spacewalk-backend] version [1.6.16-1] in directory [backend/].
Changes since SatConfig-general-1.216.25-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.6.16-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 8 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ca9d9b150e37cb2c23ec7ed1bfaa6262ed8a9d57
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 9 16:56:57 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 241de83..03cc41d 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.6.15
+Version: 1.6.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -674,6 +674,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.16-1
+- small reposync speedup
+
* Fri Sep 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.15-1
- 735059 - modified TableInsert to use our direct blob insert
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index af529ce..461fc5b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.15-1 backend/
+1.6.16-1 backend/
12 years, 8 months
Changes to 'refs/tags/SatConfig-general-1.216.25-1'
by Michael Mraka
Tag 'SatConfig-general-1.216.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-09-09 14:56 +0000
Tagging package [SatConfig-general] version [1.216.25-1] in directory [monitoring/SatConfig/general/].
Changes since rhn-client-tools-1.6.16-1:
Michael Mraka (10):
small reposync speedup
added epel6 repos
added scientific linux 6 repo
updated spacewalk repos
added rpm signing keys for F15, CentOS 6, Scientfic Linux 6 and EPEL
reordered lines to group providers together
added EPEL to the list of package providers
upgrade scripts for new package provider keys
fixed start order of Monitoring services
Automatic commit of package [SatConfig-general] release [1.216.25-1].
---
backend/satellite_tools/reposync.py | 17 -
monitoring/SatConfig/general/Monitoring.pm | 4
monitoring/SatConfig/general/SatConfig-general.spec | 5
rel-eng/packages/SatConfig-general | 2
schema/spacewalk/common/data/rhnPackageKey.sql | 58 ++-
schema/spacewalk/common/data/rhnPackageProvider.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/082-rhnPackageProvider-data.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/083-rhnPackageKey-data.sql | 40 ++
utils/spacewalk-common-channels.ini | 157 +++++++---
9 files changed, 234 insertions(+), 55 deletions(-)
---
12 years, 8 months
monitoring/SatConfig rel-eng/packages
by Michael Mraka
monitoring/SatConfig/general/SatConfig-general.spec | 5 ++++-
rel-eng/packages/SatConfig-general | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 464133352f922e0ddd0920743fe0a9431558ceaf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 9 16:56:28 2011 +0200
Automatic commit of package [SatConfig-general] release [1.216.25-1].
diff --git a/monitoring/SatConfig/general/SatConfig-general.spec b/monitoring/SatConfig/general/SatConfig-general.spec
index 6a3fce2..95af63d 100644
--- a/monitoring/SatConfig/general/SatConfig-general.spec
+++ b/monitoring/SatConfig/general/SatConfig-general.spec
@@ -2,7 +2,7 @@
%define hb_res_dir %{_sysconfdir}/ha.d/resource.d
%define installed_dir %sysv_dir/installed
Name: SatConfig-general
-Version: 1.216.24
+Version: 1.216.25
Release: 1%{?dist}
Summary: Satellite Configuration System - general setup, used by many packages
URL: https://fedorahosted.org/spacewalk
@@ -65,6 +65,9 @@ install -D -p -m 755 NOCpulse-ini $RPM_BUILD_ROOT%{_sbindir}/NOCpulse-ini
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.216.25-1
+- fixed start order of Monitoring services
+
* Thu Aug 11 2011 Jan Pazdziora 1.216.24-1
- Since autocommit is off in RHN::DB, add explicit commit to ensure our config
changes are written to the database (david.nutter(a)bioss.ac.uk)
diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfig-general
index 459f32b..bf115cc 100644
--- a/rel-eng/packages/SatConfig-general
+++ b/rel-eng/packages/SatConfig-general
@@ -1 +1 @@
-1.216.24-1 monitoring/SatConfig/general/
+1.216.25-1 monitoring/SatConfig/general/
12 years, 8 months
9 commits - backend/satellite_tools monitoring/SatConfig schema/spacewalk utils/spacewalk-common-channels.ini
by Michael Mraka
backend/satellite_tools/reposync.py | 17 -
monitoring/SatConfig/general/Monitoring.pm | 4
schema/spacewalk/common/data/rhnPackageKey.sql | 58 ++-
schema/spacewalk/common/data/rhnPackageProvider.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/082-rhnPackageProvider-data.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/083-rhnPackageKey-data.sql | 40 ++
utils/spacewalk-common-channels.ini | 157 +++++++---
7 files changed, 229 insertions(+), 53 deletions(-)
New commits:
commit 46272a63d8188bcf78060d7f218797db786d6456
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 9 15:53:35 2011 +0200
fixed start order of Monitoring services
fixing
2011-09-09 13:55:04 Failed to open /etc/notification/static/notif.ini: No such file or directory at /usr/share/perl5/vendor_perl/NOCpulse/Notif/NotifMailer.pm line 28
2011-09-09 13:55:04 Can't call method "val" on an undefined value at /usr/share/perl5/vendor_perl/NOCpulse/Notif/NotifMailer.pm line 30.
2011-09-09 13:55:04 Compilation failed in require at /usr/share/perl5/vendor_perl/NOCpulse/Notif/EmailContactMethod.pm line 12.
2011-09-09 13:55:04 BEGIN failed--compilation aborted at /usr/share/perl5/vendor_perl/NOCpulse/Notif/EmailContactMethod.pm line 12.
2011-09-09 13:55:04 Compilation failed in require at /usr/share/perl5/vendor_perl/NOCpulse/Notif/PagerContactMethod.pm line 11.
2011-09-09 13:55:04 BEGIN failed--compilation aborted at /usr/share/perl5/vendor_perl/NOCpulse/Notif/PagerContactMethod.pm line 11.
2011-09-09 13:55:04 Compilation failed in require at /usr/share/perl5/vendor_perl/NOCpulse/Notif/NotifIniInterface.pm line 12.
2011-09-09 13:55:04 BEGIN failed--compilation aborted at /usr/share/perl5/vendor_perl/NOCpulse/Notif/NotifIniInterface.pm line 12.
2011-09-09 13:55:04 Compilation failed in require at /usr/bin/generate-config line 14.
2011-09-09 13:55:04 BEGIN failed--compilation aborted at /usr/bin/generate-config line 14.
diff --git a/monitoring/SatConfig/general/Monitoring.pm b/monitoring/SatConfig/general/Monitoring.pm
index 28e6267..f8a93f1 100644
--- a/monitoring/SatConfig/general/Monitoring.pm
+++ b/monitoring/SatConfig/general/Monitoring.pm
@@ -59,8 +59,10 @@ sub startActions
if ($configIsInstalled) {
# REQUIRE that NOCpulse.ini is installed, else bad stuff could happen if
# MOC services start.
- $self->startModule(GenerateNotifConfig);
$self->startModule(NotifEscalator);
+ # NotifEscalator should be the first one because
+ # it generates /etc/notification/static/notif.ini
+ $self->startModule(GenerateNotifConfig);
$self->startModule(NotifLauncher);
$self->startModule(Notifier);
$self->startModule(AckProcessor);
commit 41370239749e3fe20db54f8fd8421915bf976419
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 15:26:26 2011 +0200
upgrade scripts for new package provider keys
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/082-rhnPackageProvider-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/082-rhnPackageProvider-data.sql
new file mode 100644
index 0000000..153458e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/082-rhnPackageProvider-data.sql
@@ -0,0 +1,4 @@
+insert into rhnPackageProvider (id, name) values
+(sequence_nextval('rhn_package_provider_id_seq'), 'EPEL' );
+
+commit;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/083-rhnPackageKey-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/083-rhnPackageKey-data.sql
new file mode 100644
index 0000000..dd35bfc
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/083-rhnPackageKey-data.sql
@@ -0,0 +1,40 @@
+-- Fedora 15
+update rhnPackageKey set provider_id = lookup_package_provider('Fedora')
+ where key_id = 'b4ebf579069c8460';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), 'b4ebf579069c8460', lookup_package_key_type('gpg'), lookup_package_provider('Fedora') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = 'b4ebf579069c8460'));
+
+-- CentOS 6
+update rhnPackageKey set provider_id = lookup_package_provider('CentOS')
+ where key_id = '0946fca2c105b9de';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '0946fca2c105b9de', lookup_package_key_type('gpg'), lookup_package_provider('CentOS') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = '0946fca2c105b9de'));
+
+-- Scientific Linux 6
+update rhnPackageKey set provider_id = lookup_package_provider('Scientific Linux')
+ where key_id = '915d75e09b1fd350';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '915d75e09b1fd350', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = '915d75e09b1fd350'));
+update rhnPackageKey set provider_id = lookup_package_provider('Scientific Linux')
+ where key_id = 'b0b4183f192a7d7d';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), 'b0b4183f192a7d7d', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = 'b0b4183f192a7d7d'));
+
+-- EPEL 5
+update rhnPackageKey set provider_id = lookup_package_provider('EPEL')
+ where key_id = '119cc036217521f6';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '119cc036217521f6', lookup_package_key_type('gpg'), lookup_package_provider('EPEL') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = '119cc036217521f6'));
+-- EPEL 6
+update rhnPackageKey set provider_id = lookup_package_provider('EPEL')
+ where key_id = '3b49df2a0608b895';
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id)
+ (select sequence_nextval('rhn_pkey_id_seq'), '3b49df2a0608b895', lookup_package_key_type('gpg'), lookup_package_provider('EPEL') from dual
+ where 1 not in (select 1 from rhnPackageKey where key_id = '3b49df2a0608b895'));
+
+commit;
commit 6a8498686fd5132f01d2e512aa07c56d3af19146
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 14:45:56 2011 +0200
added EPEL to the list of package providers
diff --git a/schema/spacewalk/common/data/rhnPackageProvider.sql b/schema/spacewalk/common/data/rhnPackageProvider.sql
index d683121..999aa54 100644
--- a/schema/spacewalk/common/data/rhnPackageProvider.sql
+++ b/schema/spacewalk/common/data/rhnPackageProvider.sql
@@ -28,6 +28,8 @@ insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'Oracle Inc.' );
insert into rhnPackageProvider (id, name) values
(sequence_nextval('rhn_package_provider_id_seq'), 'Spacewalk' );
+insert into rhnPackageProvider (id, name) values
+(sequence_nextval('rhn_package_provider_id_seq'), 'EPEL' );
commit 2de41efa0a49d0ae30621b287e79578ceca94284
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 14:38:26 2011 +0200
reordered lines to group providers together
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index fddfad5..6cd7c10 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -14,38 +14,21 @@
--
--
+-- Red Hat
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '5326810137017186', lookup_package_key_type('gpg'), lookup_package_provider('Red Hat Inc.'));
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '219180cddb42a60e', lookup_package_key_type('gpg'), lookup_package_provider('Red Hat Inc.'));
+-- RHEL 6
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'b44269d04f2a6fd2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'a8a447dce8562897', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '2802e89216ff0e46', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'a53d0bab443e1821', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '7049e44d025e513b', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '25dbef78a7048f8d', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
-
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '66ced3de1e5e0159', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+(sequence_nextval('rhn_pkey_id_seq'), '199e2f91fd431d51', lookup_package_key_type('gpg'), lookup_package_provider('Red Hat Inc.'));
-insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '2e2bcdbcb38a8516', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+-- Fedora
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('Suse'));
+(sequence_nextval('rhn_pkey_id_seq'), 'b44269d04f2a6fd2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '1dc5c758d22e77f2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
@@ -64,26 +47,52 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), 'b4ebf579069c8460', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
--- Spacewalk
+-- CentOS
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '95423d4e430a1c35', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
+(sequence_nextval('rhn_pkey_id_seq'), 'a8a447dce8562897', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
+
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), 'ed635379b3892132', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
+(sequence_nextval('rhn_pkey_id_seq'), '2802e89216ff0e46', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
--- RHEL 6
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-(sequence_nextval('rhn_pkey_id_seq'), '199e2f91fd431d51', lookup_package_key_type('gpg'), lookup_package_provider('Red Hat Inc.'));
+(sequence_nextval('rhn_pkey_id_seq'), 'a53d0bab443e1821', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '7049e44d025e513b', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
-- CentOS 6
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '0946fca2c105b9de', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
+
+-- Scientific Linux
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '25dbef78a7048f8d', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
-- Scientific Linux 6
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '915d75e09b1fd350', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), 'b0b4183f192a7d7d', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
+
+-- Oracle EL
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '66ced3de1e5e0159', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '2e2bcdbcb38a8516', lookup_package_key_type('gpg'), lookup_package_provider('Oracle Inc.'));
+
+
+-- Suse
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('Suse'));
+
+
+-- Spacewalk
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '95423d4e430a1c35', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), 'ed635379b3892132', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
+
-- EPEL 5
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '119cc036217521f6', lookup_package_key_type('gpg'), lookup_package_provider('EPEL'));
commit ac1aa687abca1483143fe7eb2eb20e403760ffd4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 14:31:07 2011 +0200
added rpm signing keys for F15, CentOS 6, Scientfic Linux 6 and EPEL
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index a52c73b..fddfad5 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -59,6 +59,10 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
-- Fedora 14
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '421caddb97a1071f', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
+-- Fedora 15
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), 'b4ebf579069c8460', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
+
-- Spacewalk
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
@@ -70,6 +74,23 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(sequence_nextval('rhn_pkey_id_seq'), '199e2f91fd431d51', lookup_package_key_type('gpg'), lookup_package_provider('Red Hat Inc.'));
+-- CentOS 6
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '0946fca2c105b9de', lookup_package_key_type('gpg'), lookup_package_provider('CentOS'));
+
+-- Scientific Linux 6
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '915d75e09b1fd350', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), 'b0b4183f192a7d7d', lookup_package_key_type('gpg'), lookup_package_provider('Scientific Linux'));
+
+-- EPEL 5
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '119cc036217521f6', lookup_package_key_type('gpg'), lookup_package_provider('EPEL'));
+-- EPEL 6
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(sequence_nextval('rhn_pkey_id_seq'), '3b49df2a0608b895', lookup_package_key_type('gpg'), lookup_package_provider('EPEL'));
+
commit;
commit f79de4523c38150e414b6739106e385ee7348fa9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 13:26:44 2011 +0200
updated spacewalk repos
removed spacewalk12*
added spacewalk15*
added spacewalk*-centos6 and spacewalk*-scientific6
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index d54690c..ed200f0 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -409,78 +409,96 @@ gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/1.3-client/Fedora/13/%(arch)s/
-[spacewalk12-server-centos5]
-name = Spacewalk Server 1.2 for %(base_channel_name)s
+[spacewalk15-server-centos5]
+name = Spacewalk Server 1.5 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
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.2/RHEL/5/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5/RHEL/5/%(arch)s/
-[spacewalk12-server-fedora12]
-name = Spacewalk Server 1.2 for %(base_channel_name)s
+[spacewalk15-server-centos6]
+name = Spacewalk Server 1.5 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = centos6-%(arch)s
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.2/Fedora/12/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5/RHEL/6/%(arch)s/
-[spacewalk12-server-fedora13]
-name = Spacewalk Server 1.2 for %(base_channel_name)s
+[spacewalk15-server-scientific6]
+name = Spacewalk Server 1.5 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora13-%(arch)s
+base_channels = scientific6-%(arch)s
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.2/Fedora/13/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5/RHEL/6/%(arch)s/
-[spacewalk12-server-fedora14]
-name = Spacewalk Server 1.2 for %(base_channel_name)s
+[spacewalk15-server-fedora15]
+name = Spacewalk Server 1.5 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = fedora15-%(arch)s
+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.5/Fedora/13/%(arch)s/
+
+[spacewalk15-server-fedora14]
+name = Spacewalk Server 1.5 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora14-%(arch)s
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.2/Fedora/14/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5/Fedora/14/%(arch)s/
-[spacewalk12-client-centos5]
-name = Spacewalk Client 1.2 for %(base_channel_name)s
+[spacewalk15-client-centos5]
+name = Spacewalk Client 1.5 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
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.2-client/RHEL/5/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5-client/RHEL/5/%(arch)s/
-[spacewalk12-client-fedora12]
-name = Spacewalk Client 1.2 for %(base_channel_name)s
+[spacewalk15-client-centos6]
+name = Spacewalk Client 1.5 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = centos6-%(arch)s
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.2-client/Fedora/12/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5-client/RHEL/6/%(arch)s/
-[spacewalk12-client-fedora13]
-name = Spacewalk Client 1.2 for %(base_channel_name)s
+[spacewalk15-client-scientific6]
+name = Spacewalk Client 1.5 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora13-%(arch)s
+base_channels = scientific6-%(arch)s
+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.5-client/RHEL/6/%(arch)s/
+
+[spacewalk15-client-fedora15]
+name = Spacewalk Client 1.5 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = fedora15-%(arch)s
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.2-client/Fedora/13/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5-client/Fedora/13/%(arch)s/
-[spacewalk12-client-fedora14]
-name = Spacewalk Client 1.2 for %(base_channel_name)s
+[spacewalk15-client-fedora14]
+name = Spacewalk Client 1.5 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora14-%(arch)s
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.2-client/Fedora/14/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/1.5-client/Fedora/14/%(arch)s/
[spacewalk14-server-centos5]
@@ -548,6 +566,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/nightly/RHEL/5/%(arch)s/
+[spacewalk-nightly-server-centos6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = centos6-%(arch)s
+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/nightly/RHEL/6/%(arch)s/
+
+[spacewalk-nightly-server-scientific6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = scientific6-%(arch)s
+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/nightly/RHEL/6/%(arch)s/
+
[spacewalk-nightly-server-fedora14]
name = Spacewalk Server (N) for %(base_channel_name)s
archs = x86_64
@@ -557,14 +593,14 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/14/%(arch)s/
-[spacewalk-nightly-server-fedora13]
+[spacewalk-nightly-server-fedora15]
name = Spacewalk Server (N) for %(base_channel_name)s
archs = x86_64
-base_channels = fedora13-%(arch)s
+base_channels = fedora15-%(arch)s
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/nightly/Fedora/13/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/15/%(arch)s/
[spacewalk-nightly-client-centos5]
@@ -576,6 +612,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/RHEL/5/%(arch)s/
+[spacewalk-nightly-client-centos6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = centos6-%(arch)s
+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/nightly-client/RHEL/6/%(arch)s/
+
+[spacewalk-nightly-client-scientific6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = scientific6-%(arch)s
+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/nightly-client/RHEL/6/%(arch)s/
+
[spacewalk-nightly-client-fedora14]
name = Spacewalk Client (N) for %(base_channel_name)s
archs = i386, x86_64
@@ -585,11 +639,11 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/14/%(arch)s/
-[spacewalk-nightly-client-fedora13]
+[spacewalk-nightly-client-fedora15]
name = Spacewalk Client (N) for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora13-%(arch)s
+base_channels = fedora15-%(arch)s
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/nightly-client/Fedora/13/%(arch)s/
+yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/15/%(arch)s/
commit 2545bd5b114fb310bf90ecc4894dcfbb69bfed37
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 12:25:22 2011 +0200
added scientific linux 6 repo
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 9753140..d54690c 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -139,6 +139,30 @@ checksum = sha256
base_channels = fedora15-%(arch)s
yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-15&arch=%(ar...
+
+[scientific6]
+archs = %(_x86_archs)s
+name = Scientific Linux 6 (%(arch)s)
+gpgkey_url = http://ftp.scientificlinux.org/linux/scientific/6/i386/os/RPM-GPG-KEY-sl6
+gpgkey_id = 9B1FD350
+gpgkey_fingerprint = E2E5 CBB5 6E19 960F F509 6994 915D 75E0 9B1F D350
+yumrepo_url = http://ftp.scientificlinux.org/linux/scientific/6/%(arch)s/os/
+
+[scientific6-updates-fast]
+label = %(base_channel)s-updates-fast
+archs = %(_x86_archs)s
+name = Scientific Linux 6 Updates FastBug (%(arch)s)
+base_channels = scientific6-%(arch)s
+yumrepo_url = http://ftp.scientificlinux.org/linux/scientific/6/%(arch)s/updates/fastbugs/
+
+[scientific6-updates-security]
+label = %(base_channel)s-updates-security
+archs = %(_x86_archs)s
+name = Scientific Linux 6 Updates Security (%(arch)s)
+base_channels = scientific6-%(arch)s
+yumrepo_url = http://ftp.scientificlinux.org/linux/scientific/6/%(arch)s/updates/security/
+
+
[centos6]
archs = %(_x86_archs)s
name = CentOS 6 (%(arch)s)
@@ -193,7 +217,7 @@ yumrepo_url = http://mirrorlist.centos.org/?release=6&arch=%(arch)s&repo=updates
label = epel6-%(base_channel)s
name = EPEL 6 for %(base_channel_name)s
archs = i386, x86_64, ppc64
-base_channels = centos6-%(arch)s
+base_channels = centos6-%(arch)s scientific6-%(arch)s
gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
gpgkey_id = 0608B895
gpgkey_fingerprint = 8C3B E96A F230 9184 DA5C 0DAE 3B49 DF2A 0608 B895
commit 34c2603af25098126c545440ba9c2f54bd115644
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 8 12:15:36 2011 +0200
added epel6 repos
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 043fc18..9753140 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -189,6 +189,17 @@ name = CentOS 6 Updates (%(arch)s)
base_channels = centos6-%(arch)s
yumrepo_url = http://mirrorlist.centos.org/?release=6&arch=%(arch)s&repo=updates
+[epel6]
+label = epel6-%(base_channel)s
+name = EPEL 6 for %(base_channel_name)s
+archs = i386, x86_64, ppc64
+base_channels = centos6-%(arch)s
+gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
+gpgkey_id = 0608B895
+gpgkey_fingerprint = 8C3B E96A F230 9184 DA5C 0DAE 3B49 DF2A 0608 B895
+yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=%(arch)s
+
+
[centos5]
archs = %(_x86_archs)s
name = CentOS 5 (%(arch)s)
commit 99bbbdfeccb7a8592f5d6034189bd7c463e0b10e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 7 14:30:21 2011 +0200
small reposync speedup
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index c1ec24b..580b585 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -416,17 +416,26 @@ class RepoSync:
package['name'] = pack.name
package['version'] = pack.version
package['release'] = pack.release
- package['epoch'] = pack.epoch
package['arch'] = pack.arch
package['checksum'] = pack.checksum
package['checksum_type'] = pack.checksum_type
package['channels'] = [{'label':self.channel_label,
'id':self.channel['id']}]
package['org_id'] = self.channel['org_id']
- try:
- self._importer_run(package, caller, backend)
- except:
+
+ imported = False
+ # yum's createrepo puts epoch="0" to primary.xml even for packages
+ # with epoch='' so we have to check empty epoch first because it's
+ # more common situation
+ if pack.epoch == '0':
package['epoch'] = ''
+ try:
+ self._importer_run(package, caller, backend)
+ imported = True
+ except:
+ pass
+ if not imported:
+ package['epoch'] = pack.epoch
self._importer_run(package, caller, backend)
backend.commit()
12 years, 8 months
Changes to 'refs/tags/rhn-client-tools-1.6.16-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.6.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-09 14:09 +0000
Tagging package [rhn-client-tools] version [1.6.16-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.6.41-1:
Jan Pazdziora (2):
576223 - make rhn-profile-sync write errors to stderr.
Automatic commit of package [rhn-client-tools] release [1.6.16-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 8 ++++----
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
---
12 years, 8 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 27e73b072704a3be4a4a0757ba06ad37427d5ccf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 9 16:09:26 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.16-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 02ccdc5..d348660 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.15
+Version: 1.6.16
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Sep 09 2011 Jan Pazdziora 1.6.16-1
+- 576223 - make rhn-profile-sync write errors to stderr.
+
* Wed Aug 24 2011 Martin Minar <mminar(a)redhat.com> 1.6.15-1
- Revert "727908 - registration: send correct hostname during kickstart"
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 7b0211e..ed8c18e 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.15-1 client/rhel/rhn-client-tools/
+1.6.16-1 client/rhel/rhn-client-tools/
12 years, 8 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 977cd77d51c2c4b784d1c899142d39eb3fd99747
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 9 16:08:06 2011 +0200
576223 - make rhn-profile-sync write errors to stderr.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
index 55d09b3..ac8df42 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -203,12 +203,12 @@ class RhnCli(object):
@staticmethod
def __exceptionHandler(type, value, tb):
log = up2dateLog.initLog()
- print _("An error has occurred:")
+ sys.stderr.write(_("An error has occurred:") + "\n")
if hasattr(value, "errmsg"):
- print value.errmsg
+ sys.stderr.write(str(value.errmsg) + "\n")
log.log_exception(type, value, tb)
else:
- print type
+ sys.stderr.write(str(type) + "\n")
log.log_exception(type, value, tb)
- print _("See /var/log/up2date for more information")
+ sys.stderr.write(_("See /var/log/up2date for more information") + "\n")
12 years, 8 months