client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 +++++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 48f88ed8655d79fb723a37a96d91650fa8398c8c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 14 11:34:29 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.2.7-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 046ecbf..70adbe3 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.2.6
+Version: 1.2.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -281,6 +281,12 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue Sep 14 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.7-1
+- 632203 - fix comment to corespond with code, decoding unicode to unicode
+ produce traceback (msuchy(a)redhat.com)
+- l10n: Updates to Oriya (or) translation (mgiri(a)fedoraproject.org)
+- l10n: Updates to Russian (ru) translation (ypoyarko(a)fedoraproject.org)
+
* Tue Aug 31 2010 Jan Pazdziora 1.2.6-1
- 603028 - when checking package architecture during errata update, allow
transition to and from noarch.
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index d495483..aafef8a 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.2.6-1 client/rhel/rhn-client-tools/
+1.2.7-1 client/rhel/rhn-client-tools/
13 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.2.20-1'
by Michael Mraka
Tag 'spacewalk-schema-1.2.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-14 07:56 +0000
Tagging package [spacewalk-schema] version [1.2.20-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.2.19-1:
Michael Mraka (2):
633263 - removed sha384 from list of checksums
Automatic commit of package [spacewalk-schema] release [1.2.20-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/data/rhnChecksumType.sql | 5 +++--
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/090-rhnChecksumType-drop-sha384.sql | 2 ++
4 files changed, 10 insertions(+), 4 deletions(-)
---
13 years, 9 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5947535a0377ebe16785a6a60201ef311afc85dd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 14 09:56:05 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.20-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 2a516a3..0261c70 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.19-1 schema/spacewalk/
+1.2.20-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 69eab11..3ee9c48 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.2.19
+Version: 1.2.20
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Tue Sep 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.20-1
+- 633263 - removed sha384 from list of checksums
+
* Mon Sep 13 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.19-1
- added upgrade script for rhnUserMessageType
13 years, 9 months
schema/spacewalk
by Michael Mraka
schema/spacewalk/common/data/rhnChecksumType.sql | 5 +++--
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/090-rhnChecksumType-drop-sha384.sql | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit eda5f57c1fb5ddbda61a949028c1190d97e4689a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 23:12:15 2010 +0200
633263 - removed sha384 from list of checksums
diff --git a/schema/spacewalk/common/data/rhnChecksumType.sql b/schema/spacewalk/common/data/rhnChecksumType.sql
index 5c082e0..e5ef834 100644
--- a/schema/spacewalk/common/data/rhnChecksumType.sql
+++ b/schema/spacewalk/common/data/rhnChecksumType.sql
@@ -23,8 +23,9 @@ insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha1', 'SHA1sum' );
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha256', 'SHA256sum' );
-insert into rhnChecksumType (id, label, description) values
- (rhn_checksum_id_seq.nextval, 'sha384', 'SHA384sum' );
+-- bug 633263: yum can't use sha384 thus it's been disabled
+--insert into rhnChecksumType (id, label, description) values
+-- (rhn_checksum_id_seq.nextval, 'sha384', 'SHA384sum' );
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha512', 'SHA512sum' );
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/090-rhnChecksumType-drop-sha384.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/090-rhnChecksumType-drop-sha384.sql
new file mode 100644
index 0000000..694bb24
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/090-rhnChecksumType-drop-sha384.sql
@@ -0,0 +1,2 @@
+delete from rhnChecksumType
+ where label = 'sha384';
13 years, 9 months
Changes to 'refs/tags/spacewalk-schema-1.2.19-1'
by Michael Mraka
Tag 'spacewalk-schema-1.2.19-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-13 20:38 +0000
Tagging package [spacewalk-schema] version [1.2.19-1] in directory [schema/spacewalk/].
Changes since oracle-lib-compat-10.2-23:
Justin Sherrill (2):
580998 - making deprecatedVersion become deprecatedReason since we never used it as a version
fixing brokeness with spacewalk-update-signatures, Log was being used even if it hadnt been created (if debug was enabled), reported by spacewalk user
Michael Mraka (7):
added forgotten upgrade script for rhnUserMessageType
is_embedded_db is already defined in Setup.pm
no more RHEL4 so we always have yum
removed dead code (after up2date code removal)
added --external-db option to installer
fixed syntax errors/typos
Automatic commit of package [spacewalk-schema] release [1.2.19-1].
---
backend/satellite_tools/spacewalk-update-signatures | 3
java/buildconf/apidoc/html/handler.txt | 2
java/buildconf/apidoc/jsp/handler.txt | 2
java/buildconf/apidoc/singlepage/handler.txt | 2
java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java | 4
java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java | 2
rel-eng/packages/spacewalk-schema | 2
satellite/install/install.pl | 281 ----------
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/082-rhnUserMessageType-drop-table.sql | 1
spacewalk/setup/lib/Spacewalk/Setup.pm | 17
11 files changed, 45 insertions(+), 276 deletions(-)
---
13 years, 9 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5f426990d7ab056d61723d483d1f82c9e8abf5ec
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 22:38:12 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.19-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ff82831..2a516a3 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.18-1 schema/spacewalk/
+1.2.19-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 25cac41..69eab11 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.2.18
+Version: 1.2.19
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Mon Sep 13 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.19-1
+- added upgrade script for rhnUserMessageType
+
* Thu Sep 09 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.18-1
- upgrade script for rhn_org.pkb
13 years, 9 months
6 commits - satellite/install schema/spacewalk spacewalk/setup
by Michael Mraka
satellite/install/install.pl | 281 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/082-rhnUserMessageType-drop-table.sql | 1
spacewalk/setup/lib/Spacewalk/Setup.pm | 17
3 files changed, 32 insertions(+), 267 deletions(-)
New commits:
commit bfac704c0ced6d16f60e9063b3feb8c2498fe159
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 16:57:11 2010 +0200
fixed syntax errors/typos
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 3b26c30..238181b 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -100,7 +100,7 @@ print loc("* Applying updates.\n");
install_updates_packages();
print loc("* Installing RHN packages.\n");
-install_rhn_packages();
+install_rhn_packages(\%opts);
my %satellite_rpms = map { m!^.+/(.+)-.+-.+$! and ( $1 => 1 ); }
@@ -738,9 +738,10 @@ sub install_updates_packages {
}
sub install_rhn_packages {
+ my $opts = shift;
my @rpms = glob("Satellite/*.rpm");
- if (is_embedded_db($opts)) {
+ if (Spacewalk::Setup::is_embedded_db($opts)) {
push(@rpms, glob("EmbeddedDB/*.rpm"));
}
system_or_exit(['yum', 'localinstall', '-y', @rpms],
commit 9e8eca2c39237a5b18176922850cb0346c3d6e1f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 16:47:55 2010 +0200
added --external-db option to installer
to be able install satellite with external db even from Embedded DB ISO
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index d838e32..3b26c30 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -738,7 +738,12 @@ sub install_updates_packages {
}
sub install_rhn_packages {
- system_or_exit(['yum', 'localinstall', '-y', glob("Satellite/*.rpm EmbeddedDB/*.rpm")],
+ my @rpms = glob("Satellite/*.rpm");
+
+ if (is_embedded_db($opts)) {
+ push(@rpms, glob("EmbeddedDB/*.rpm"));
+ }
+ system_or_exit(['yum', 'localinstall', '-y', @rpms],
26,
'Could not install RHN packages. Most likely your system is not configured with the @Base package group. See the RHN Satellite Server Installation Guide for more information about Software Requirements.');
return 1;
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 3896789..38b8c1c 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -108,6 +108,7 @@ sub parse_options {
"run-updater:s",
"run-cobbler",
"enable-tftp:s",
+ "external-db",
);
my $usage = loc("usage: %s %s\n",
@@ -193,7 +194,8 @@ sub load_answer_file {
# an "EmbeddedDB" directory beneath the dir we're running from (i.e.
# installing from ISO)
sub is_embedded_db {
- return ( -d 'EmbeddedDB' ? 1 : 0 );
+ my $opts = shift;
+ return (-d 'EmbeddedDB' and not defined($opts->{'external-db'}) ? 1 : 0 );
}
sub system_debug {
@@ -298,7 +300,7 @@ sub upgrade_stop_services {
'Could not stop the http service.');
system_or_exit(['/sbin/service', 'taskomatic', 'stop'], 27,
'Could not stop the taskomatic service.');
- if (is_embedded_db()) {
+ if (is_embedded_db($opts)) {
system_or_exit(['/sbin/service', 'rhn-database', 'stop'], 31,
'Could not stop the rhn-database service.');
}
@@ -902,7 +904,7 @@ sub oracle_setup_db {
print loc("* Setting up Oracle environment.\n");
- oracle_check_for_users_and_groups();
+ oracle_check_for_users_and_groups($opts);
print loc("* Setting up database.\n");
oracle_setup_embedded_db($opts, $answers);
@@ -913,7 +915,7 @@ sub oracle_setup_db {
sub oracle_upgrade_start_db {
my $opts = shift;
- if (is_embedded_db()) {
+ if (is_embedded_db($opts)) {
if ($opts->{'upgrade'}) {
system_or_exit(['/sbin/service', 'oracle', 'start'], 19,
'Could not start the oracle database service.');
@@ -924,7 +926,8 @@ sub oracle_upgrade_start_db {
}
sub oracle_check_for_users_and_groups {
- if (is_embedded_db()) {
+ my $opts = shift;
+ if (is_embedded_db($opts)) {
my @required_users = qw/oracle/;
my @required_groups = qw/oracle dba/;
@@ -944,7 +947,7 @@ sub oracle_setup_embedded_db {
my $opts = shift;
my $answers = shift;
- if (not is_embedded_db()) {
+ if (not is_embedded_db($opts)) {
return 0;
} else {
$answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
@@ -1068,7 +1071,7 @@ sub oracle_setup_db_connection {
};
if ($@) {
print loc("Could not connect to the database. Your connection information may be incorrect. Error: %s\n", $@);
- if (is_embedded_db() or $opts->{"non-interactive"}) {
+ if (is_embedded_db($opts) or $opts->{"non-interactive"}) {
exit 19;
}
commit 916f2eb3c2c31992b013d6e7ecee2388fbba0a7d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 16:40:49 2010 +0200
removed dead code (after up2date code removal)
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index d5c535b..d838e32 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -710,36 +710,6 @@ EOF
}
-sub get_arches_for_needed_rpms {
- my $needed_rpms = shift;
- my %arches;
- for (keys %$needed_rpms) {
- if (/\.(i\d86|x86_64|ia64|ppc64|s390|s390x)$/) {
- $arches{$1} = 1;
- } else {
- $arches{''} = 1;
- }
- }
- return sort { length($a) <=> length($b) or $a cmp $b } keys %arches;
-}
-
-sub up2date_command_for_arch {
- my ($needed_rpms, $arch) = @_;
- my $system_arch = `uname -i`;
- chomp $system_arch;
- if ($arch eq '') {
- my @pkgs = sort grep { not /\./ } keys %$needed_rpms;
- if (@pkgs) {
- return ('up2date', "--arch=$system_arch", '--arch=noarch', '-i', @pkgs);
- }
- } else {
- my @pkgs = sort map { s/\..*$//; $_ } grep { /\.$arch$/ } keys %$needed_rpms;
- if (@pkgs) {
- return ('up2date', '-i', "--arch=$arch", @pkgs);
- }
- }
-}
-
sub print_yum_commands {
my $needed_rpms = shift;
if (keys %$needed_rpms) {
@@ -747,79 +717,6 @@ sub print_yum_commands {
}
}
-sub print_up2date_commands {
- my $needed_rpms = shift;
- my @arches = get_arches_for_needed_rpms($needed_rpms);
- return if not @arches;
-
- print loc(<<EOF);
-
-The following may be used to install needed packages on RHN-registered system:
-EOF
- for my $arch (@arches) {
- my @command = up2date_command_for_arch($needed_rpms, $arch);
- if (@command) {
- print "\t@command\n"
- }
- }
-}
-
-sub purge_needed_rpms {
- my $needed_rpms = shift;
- my $system_arch = `uname -i`;
- chomp $system_arch;
- my @anyarch_pkgs = grep { not /\./ } keys %$needed_rpms;
- @anyarch_pkgs = map { ($_ . ".noarch", $_ . ".$system_arch") } @anyarch_pkgs;
- my @somearch_pkgs = grep { /\./ } keys %$needed_rpms;
- my @installed_needed_rpms = grep { not /\s/ }
- map { chomp; $_ }
- ( @anyarch_pkgs ? `rpm -q --qf '%{name}\n' @anyarch_pkgs` : () ),
- ( @somearch_pkgs ? `rpm -q --qf '%{name}.%{arch}\n' @somearch_pkgs` : () );
- for (@installed_needed_rpms) {
- delete $needed_rpms->{$_};
- }
-}
-
-sub system_debug_stdout {
- local $| = 1;
- my $logfile = Spacewalk::Setup::INSTALL_LOG_FILE;
- local * LOG;
- open LOG, '>>', Spacewalk::Setup::INSTALL_LOG_FILE or die "Failed to append logfile $logfile: $!\n";
- local * PIPE;
- open PIPE, "@_ 2>&1 |" or die "Feiled to run @_: $!\n";
- while (<PIPE>) {
- print LOG $_;
- print;
- }
- close LOG;
- close PIPE;
- return $?;
-}
-
-sub rpm_import_gpg {
- my $opts = shift;
-
- my $check_up2date_l = `up2date -l 2>&1`;
- if ($? and defined $check_up2date_l and $check_up2date_l =~ /(rpm\s+--import.+)/) {
- my $rpm_import = $1;
- if ($opts->{"skip-gpg-key-import"}) {
- print loc("** up2date/rpm: Skipping gpg key import\n");
- return 0;
- }
- print loc("** Running %s\n", $rpm_import);
- system_debug_stdout($rpm_import);
- }
- return 1;
-}
-
-sub up2date_is_available {
- print loc("** Checking if up2date is available ...\n");
- if (grep /^bash-/, `up2date --showall 2>&1`) {
- return 1;
- }
- return;
-}
-
my $yum_available;
sub yum_is_available {
return $yum_available if defined $yum_available;
commit 84da1ae184cb450542ac5d6d7c6ba879e6aa872e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 15:29:51 2010 +0200
no more RHEL4 so we always have yum
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 4f5b051..d5c535b 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -72,18 +72,6 @@ rhn_register(\%opts, \%answers, \%up2dateOptions, \%rhnOptions);
Spacewalk::Setup::upgrade_stop_services(\%opts);
remove_obsoleted_packages(\%opts);
-my $have_yum = ( -f '/usr/bin/yum' ? 1 : 0 );
-if ($have_yum) {
- # If we have yum available but are on RHEL 4, stick with up2date:
- # NOTE: Even if the system has no redhat-release (i.e. Fedora) this regex
- # will simply not match.
- my $redhat_release = `rpm -q --qf='%{VERSION}' redhat-release`;
- if ($redhat_release =~ /^4.*/) {
- $have_yum = 0;
- print loc("Warning: Found yum on RHEL 4, using up2date instead.\n");
- }
-}
-
my $run_updater;
if (defined $opts{'run-updater'}) {
@@ -102,15 +90,11 @@ if (defined $opts{'run-updater'}) {
}
my (%rpm_qa, $needed_rpms);
-if ($have_yum) {
- @rpm_qa{ map { chomp ; $_; } `rpm -qa --qf '%{name}\n'` } = ();
- print loc("* Checking for uninstalled prerequisites.\n");
- $needed_rpms = check_required_rpms(\%opts, \%answers, $run_updater, \%rpm_qa);
- $needed_rpms = {} if not defined $needed_rpms;
-} else {
- print loc("* Installing required packages.\n");
- install_required_rpms(\%opts, \%answers, $run_updater);
-}
+
+@rpm_qa{ map { chomp ; $_; } `rpm -qa --qf '%{name}\n'` } = ();
+print loc("* Checking for uninstalled prerequisites.\n");
+$needed_rpms = check_required_rpms(\%opts, \%answers, $run_updater, \%rpm_qa);
+$needed_rpms = {} if not defined $needed_rpms;
print loc("* Applying updates.\n");
install_updates_packages();
@@ -118,23 +102,22 @@ install_updates_packages();
print loc("* Installing RHN packages.\n");
install_rhn_packages();
-if ($have_yum) {
- my %satellite_rpms = map { m!^.+/(.+)-.+-.+$! and ( $1 => 1 ); }
+
+my %satellite_rpms = map { m!^.+/(.+)-.+-.+$! and ( $1 => 1 ); }
glob("Satellite/*.rpm EmbeddedDB/*.rpm");
- my %current_rpm_qa =
+my %current_rpm_qa =
map { ( $_ => 1 ) }
grep { not exists $rpm_qa{$_} and not exists $satellite_rpms{$_} }
map { chomp ; $_; } `rpm -qa --qf '%{name}\n'`;
- my @extra_rpms = grep { not exists $needed_rpms->{$_} } sort keys %current_rpm_qa;
- if (@extra_rpms) {
+my @extra_rpms = grep { not exists $needed_rpms->{$_} } sort keys %current_rpm_qa;
+if (@extra_rpms) {
print loc("Warning: more packages were installed by yum than expected:\n");
print map "\t$_\n", @extra_rpms;
- }
- my @not_installed_rpms = grep { not exists $current_rpm_qa{$_} } sort keys %$needed_rpms;
- if (@not_installed_rpms) {
+}
+my @not_installed_rpms = grep { not exists $current_rpm_qa{$_} } sort keys %$needed_rpms;
+if (@not_installed_rpms) {
print loc("Warning: yum did not install the following packages:\n");
print map "\t$_\n", @not_installed_rpms;
- }
}
# Call spacewalk-setup:
@@ -726,110 +709,6 @@ EOF
return;
}
-sub install_required_rpms {
- my $opts = shift;
- my $answers = shift;
- my $run_updater = shift;
-
- my $needed_rpms = get_required_rpms();
-
- purge_needed_rpms($needed_rpms);
- if (keys %$needed_rpms) {
- my $package_list = join "\n\t", sort keys %$needed_rpms;
- print loc(<<'EOF', $package_list);
-The following packages from Red Hat Enterprise Linux that are not part
-of the @base group have to be installed on this system for the installer
-and the Satellite to operate correctly:
-
- %s
-
-EOF
-
- if (defined $run_updater and not($run_updater)) {
- print loc(<<'EOF');
-Please install the packages listed above and rerun the Satellite installer.
-EOF
- print_up2date_commands($needed_rpms);
- exit 6;
- }
- if (not(up2date_is_available())) {
- print loc(<<'EOF');
-We will not try to install the packages now as this system appears not to be
-registered with RHN. Please install the packages listed above and rerun
-the Satellite installer.
-EOF
- print_up2date_commands($needed_rpms);
- exit 5;
- }
- if (not defined $run_updater) {
- print loc(<<'EOF');
-We can try to install the needed packages now, by running up2date -i.
-EOF
- ask(-question => loc('Do you want to run this command now [y/N]'),
- -answer => \$run_updater,
- -test => qr/^/,
- );
-
- if (not $run_updater =~ /^\s*y(es)?\s*$/i) {
- print loc(<<'EOF');
-Very well, we won't install these packages now. Please rerun the installer
-once you have installed them. Thank you.
-EOF
- print_up2date_commands($needed_rpms);
- exit 2;
- }
- }
-
- rpm_import_gpg($opts);
-
- print loc(<<'EOF', Spacewalk::Setup::INSTALL_LOG_FILE);
-Installing packages. The log can be found in
-
- %s
-
-You can tail -f in another terminal to see the progress.
-EOF
-
- for my $arch (get_arches_for_needed_rpms($needed_rpms)) {
- my $ret = 0;
- my @command = up2date_command_for_arch($needed_rpms, $arch);
- if (@command) {
- print loc("Running %s\n", "@command");
- $ret = system_debug(@command);
- }
- if ($ret) {
- print loc(<<'EOF', Spacewalk::Setup::INSTALL_LOG_FILE);
-We've tried to run the up2date command but it looks like it failed. Please
-review the log file
-
- %s
-
-and fix whatever the problem might be.
-EOF
- exit 3;
- }
- purge_needed_rpms($needed_rpms);
- }
-
- purge_needed_rpms($needed_rpms);
- if (keys %$needed_rpms) {
- my $not_installed = join "\n\t", sort keys %$needed_rpms;
- print loc(<<'EOF', $not_installed, Spacewalk::Setup::INSTALL_LOG_FILE);
-It looks like installation of packages failed. The following are still
-missing:
-
- %s
-
-Please install them and rerun the Satellite installer. The log file
-
- %s
-
-might also have some useful information.
-EOF
- exit 4;
- }
- }
-}
sub get_arches_for_needed_rpms {
my $needed_rpms = shift;
@@ -962,26 +841,9 @@ sub install_updates_packages {
}
sub install_rhn_packages {
- if ($have_yum) {
- system_or_exit(['yum', 'localinstall', '-y', glob("Satellite/*.rpm EmbeddedDB/*.rpm")],
+ system_or_exit(['yum', 'localinstall', '-y', glob("Satellite/*.rpm EmbeddedDB/*.rpm")],
26,
'Could not install RHN packages. Most likely your system is not configured with the @Base package group. See the RHN Satellite Server Installation Guide for more information about Software Requirements.');
- } else {
- my @rpms = glob("Satellite/*.rpm EmbeddedDB/*.rpm");
-
- # skip packages already installed or newer version already installed
- for my $i (0..$#rpms) {
- my $ret = system ("rpm -U --test --nodeps --quiet 2>/dev/null $rpms[$i]");
- if ($ret != 0) {
- delete($rpms[$i]);
- }
- }
- if (@rpms) {
- system_or_exit(['rpm', '-Uv', @rpms],
- 26,
- 'Could not install RHN packages. Most likely your system is not configured with the @Base package group. See the RHN Satellite Server Installation Guide for more information about Software Requirements.');
- }
- }
return 1;
}
commit 9272032ec46c4632445d48ed31302c8a69939c7a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 15:01:34 2010 +0200
is_embedded_db is already defined in Setup.pm
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index a001005..4f5b051 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -524,10 +524,6 @@ sub empty {
return ($text ? 0 : 1);
}
-sub is_embedded_db {
- return ( -d 'EmbeddedDB' ? 1 : 0 );
-}
-
sub remove_obsoleted_packages {
my $opts = shift;
if ($opts->{'upgrade'}) {
commit 220b95586d64da32bfddc0c18979a01dc51fa0be
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 13 11:52:23 2010 +0200
added forgotten upgrade script for rhnUserMessageType
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/082-rhnUserMessageType-drop-table.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/082-rhnUserMessageType-drop-table.sql
new file mode 100644
index 0000000..9a90e0e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/082-rhnUserMessageType-drop-table.sql
@@ -0,0 +1 @@
+drop table rhnUserMessageType;
13 years, 9 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-update-signatures | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7e8bcac648edd966d0f08a796446e47d320a64e6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 13 16:06:40 2010 -0400
fixing brokeness with spacewalk-update-signatures, Log was being used even if it hadnt been created (if debug was enabled), reported by spacewalk user
diff --git a/backend/satellite_tools/spacewalk-update-signatures b/backend/satellite_tools/spacewalk-update-signatures
index a0a816c..cfbe93b 100644
--- a/backend/satellite_tools/spacewalk-update-signatures
+++ b/backend/satellite_tools/spacewalk-update-signatures
@@ -117,7 +117,8 @@ def process_package_data():
if not os.path.exists(full_path):
skip_list.append(full_path)
- Log.writeMessage("File not %s found" % (full_path))
+ if debug:
+ Log.writeMessage("File not %s found" % (full_path))
continue
try:
13 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-1.1.4-1'
by Justin Sherrill
Tag 'spacewalk-proxy-1.1.4-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-09-13 15:40 +0000
Tagging package [spacewalk-proxy] version [1.1.4-1] in directory [proxy/proxy/].
Changes since spacewalk-java-1.1.52-1:
Justin Sherrill (2):
629102 - Adding range to the allowed header list for proxy
Automatic commit of package [spacewalk-proxy] release [1.1.4-1].
---
proxy/proxy/rhnShared.py | 2 +-
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
13 years, 9 months
Branch 'SPACEWALK-1.1' - 2 commits - proxy/proxy rel-eng/packages
by Justin Sherrill
proxy/proxy/rhnShared.py | 2 +-
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 99b643616e7b37bc18bf75d529d263c22780d4ef
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 13 11:40:16 2010 -0400
Automatic commit of package [spacewalk-proxy] release [1.1.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index a21708d..0ae856a 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.1.3
+Version: 1.1.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -318,6 +318,10 @@ fi
%changelog
+* Mon Sep 13 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.4-1
+- 629102 - Adding range to the allowed header list for proxy
+ (jsherril(a)redhat.com)
+
* Fri Jul 16 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.3-1
- oracle client has been removed from /opt/oracle ages ago
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index cf730ff..f9ca0df 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.1.3-1 proxy/proxy/
+1.1.4-1 proxy/proxy/
commit 0415467dec367cff27ec4f919c29bc2e1f8fd59f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Aug 31 19:03:51 2010 -0400
629102 - Adding range to the allowed header list for proxy
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index a65837e..05a10da 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -329,7 +329,7 @@ class SharedHandler:
# mod_wsgi modifies incoming headers so we have to transform them back
k = k.replace('_','-')
if not (string.lower(k)[:2] == 'x-' or
- string.lower(k) in ['content-length', 'user-agent', 'content-type']):
+ string.lower(k) in ['range', 'content-length', 'user-agent', 'content-type']):
# filter out header we don't want to send
continue
if type(vals) not in (ListType, TupleType):
13 years, 9 months