spacewalk/setup/bin/spacewalk-setup | 87 +++------------------------------ spacewalk/setup/lib/Spacewalk/Setup.pm | 11 +--- 2 files changed, 13 insertions(+), 85 deletions(-)
New commits: commit 1d627a1a4e667ba655cb7c947e612549b88b67d9 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:33:01 2010 +0200
No invocation of external programs with one string, no need to have $cmdargs.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index db76a91..d851cfa 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -18,13 +18,6 @@ use warnings;
use English;
-# Store the command line args for calls to other scripts. These -# seem to be stripped as soon as we do the validation. -my $cmdargs = ""; -foreach my $t (@ARGV) { - $cmdargs = $cmdargs . " " . $t; -} - use Params::Validate qw(validate); Params::Validate::validation_options(strip_leading => "-");
commit 53a73b75e8926bda9038ef70a3e0b57ab6826eca Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:31:33 2010 +0200
Constants SCHEMAS_DIR and DEFAULT_RHN_CONF_LOCATION not used in spacewalk-setup and Spacewalk::Setup, removing.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index c2a8740..db76a91 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -45,8 +45,6 @@ $DEBUG = 0; use constant DEFAULT_CA_CERT_NAME => 'RHN-ORG-TRUSTED-SSL-CERT';
-use constant SCHEMAS_DIR => '/usr/share/spacewalk/schema/'; - use constant COBBLER_COMMAND => 'cobbler-setup';
my %opts = Spacewalk::Setup::parse_options(); diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 21ed6de..0688e51 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -42,9 +42,6 @@ use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc", "sysconfig", use constant DEFAULT_ANSWER_FILE_GLOB => SHARED_DIR . '/defaults.d/*.conf';
-use constant DEFAULT_RHN_CONF_LOCATION => - '/etc/rhn/rhn.conf'; - use constant DEFAULT_RHN_ETC_DIR => '/etc/sysconfig/rhn';
commit 1ebc28a7dc7cbe5db38bc0771e5848614fc74aa8 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:14:57 2010 +0200
set_channel_family does not seem to be used in spacewalk-setup (Sat::Cert), removing.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 9c0c186..c2a8740 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1462,14 +1462,6 @@ sub _init { return; }
-sub set_channel_family { - my $self = shift; - my $label = shift; - my $quantity = shift; - - $self->push_field(name => 'channel-families', family => $label, quantity => $quantity); -} - sub version { my $self = shift;
commit 96bde99bd9ef9163ac92ab4223a6c243bb17bfbf Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:09:04 2010 +0200
Removal of clear_channel_families made clear_field in bin/spacewalk-setup unused, removing.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 678aeb3..9c0c186 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1415,13 +1415,6 @@ sub add_field { push @{$self->{fields}}, @fields; }
-sub clear_field { - my $self = shift; - my $field = shift; - - delete $self->{field_values}->{$field}; -} - sub set_field { my $self = shift; my $field = shift;
commit b07e230727c58853bfded4ec11b67add70f2f43c Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:06:12 2010 +0200
current_generation in spacewalk-setup (Sat::Cert) not used, removing.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 8b54016..678aeb3 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1455,11 +1455,6 @@ sub set_required_fields { $self->{required_fields} = @fields; }
-# change this when signature criteria changes -sub current_generation { - return 2; -} - sub _init { my $self = shift;
commit 685cca4e178ee8da3f117078398f10b885978b8a Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:04:25 2010 +0200
Removing as_checksum_string and check_required_fields from spacewalk-setup (Sat::Cert), we have them in RHN::Cert.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 566f602..8b54016 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1455,15 +1455,6 @@ sub set_required_fields { $self->{required_fields} = @fields; }
-sub check_required_fields { - my $self = shift; - - foreach my $f (@{$self->{required_fields}}) { - die "Required field $f not found in $self\n" - unless defined $self->{field_values}->{$f}; - } -} - # change this when signature criteria changes sub current_generation { return 2;
commit 76c570056a9e5dfae44d0fd8abaebc1ba4ddb493 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:03:42 2010 +0200
Removing as_checksum_string from spacewalk-setup (Sat::Cert), we have it in RHN::Cert.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index b982a95..566f602 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1448,30 +1448,6 @@ sub get_field { return $self->{field_values}->{$field}; }
-sub as_checksum_string { - my $self = shift; - - my $data; - foreach my $field (sort @{$self->{fields}}) { - my $val = $self->get_field($field); - - next unless exists $self->{field_values}->{$field}; - - if (defined $val) { - if (ref $val) { - foreach my $val (sort { join("", sort %$a) cmp join("", sort %$b) } @$val) { - $data .= "$field-" . join("-", map { $_, $val->{$_} } sort keys %$val) . "\n"; - } - } - else { - $data .= $field . "-" . $self->get_field($field) . "\n"; - } - } - } - - return $data; -} - sub set_required_fields { my $self = shift; my @fields = @_;
commit 7ecacc36dc94f7e88fd01a92a16672f9c8ffcf33 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 15:00:58 2010 +0200
Removing need_oracle_9i_10g_upgrade from spacewalk-setup, we have it in Spacewalk::Setup as well.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 8afb413..b982a95 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1234,13 +1234,6 @@ sub random_password { return $ret; }
-sub need_oracle_9i_10g_upgrade { - my $orahome = qx{dbhome embedded}; - chomp($orahome); - my $spfile = $orahome. "/dbs/spfilerhnsat.ora"; - return (not -r $spfile); -} - sub setup_gpg { my $opts = shift;
commit 17a17641475ebc97fe126ade365b8e6b713b37c7 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 14:34:03 2010 +0200
Do implicit imports.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 31f82cf..8afb413 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (c) 2008,2009 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 @@ -25,19 +25,19 @@ foreach my $t (@ARGV) { $cmdargs = $cmdargs . " " . $t; }
-use Params::Validate; +use Params::Validate qw(validate); Params::Validate::validation_options(strip_leading => "-");
-use Mail::RFC822::Address; -use File::Spec; -use DBI; +use Mail::RFC822::Address (); +use File::Spec (); +use DBI (); use Digest::MD5 qw/md5_hex/; -use DateTime; -use Sys::Hostname; -use Spacewalk::Setup; +use DateTime (); +use Sys::Hostname (); +use Spacewalk::Setup (); use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
-use RHN::DB; +use RHN::DB ();
my $DEBUG; $DEBUG = 0; diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index da1798a..21ed6de 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -10,14 +10,14 @@ use Exporter 'import'; use vars '@EXPORT_OK'; @EXPORT_OK = qw(loc system_debug system_or_exit);
-use Getopt::Long; +use Getopt::Long qw(GetOptions); use Symbol qw(gensym); -use IPC::Open3; -use Pod::Usage; +use IPC::Open3 qw(open3); +use Pod::Usage qw(pod2usage); use POSIX ":sys_wait_h"; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
-use Params::Validate; +use Params::Validate qw(validate); Params::Validate::validation_options(strip_leading => "-");
=head1 NAME
spacewalk-commits@lists.fedorahosted.org