web/modules/pxt/PXT/ApacheHandler.pm | 11
web/modules/rhn/RHN/API/Exception.pm | 19 -
web/modules/rhn/RHN/Kickstart.pm | 591 -----------------------------------
3 files changed, 621 deletions(-)
New commits:
commit 8c9726c2aacf2d3c1e5cb625714f819b5a17083c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 12:55:55 2010 +0100
We do not ship */rpc/api-exceptions/*.xml, so this code is noop, removing.
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index d68c800..9c8ba80 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -84,17 +84,6 @@ sub handler {
}
}
- # Load API exceptions
- my $exception_box = RHN::API::Exception->exception_box;
-
- if ($exception_box->is_empty) {
- my $path = File::Spec->catfile($request->document_root,
"/rpc/api-exceptions/*.xml");
-
- foreach my $file (glob $path) {
- RHN::API::Parser->parse_exceptions($file);
- }
- }
-
my $filename = $r->filename;
my ($file_contents, $file_classes);
commit c5fa1dfe9ae89e2f3812c9dc6d8c7303baf6b26a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 12:06:16 2010 +0100
clear_exception_box and throw_generic are not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/API/Exception.pm b/web/modules/rhn/RHN/API/Exception.pm
index 0e65e53..29942b5 100644
--- a/web/modules/rhn/RHN/API/Exception.pm
+++ b/web/modules/rhn/RHN/API/Exception.pm
@@ -30,25 +30,6 @@ sub exception_box {
return $global_exception_box;
}
-sub clear_exception_box {
- my $class = shift;
-
- undef $global_exception_box;
-}
-
-sub throw_generic {
- my $class = shift;
- my $string = shift;
- my @extra = @_;
-
- my $exception = $class->new($string);
- $exception->{fault_code} = -1;
- $exception->{fault_text} = $string;
- $exception->{extra_data} = \@extra;
-
- $exception->SUPER::throw;
-}
-
sub throw_named {
my $class = shift;
my $string = shift;
commit 1ad6fc9ade1bbf08e95be373b57a2a3d68c03a85
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 11:58:37 2010 +0100
RHN::Kickstart's render does not seem to be used anymore, removing, together with
other render_ methods.
diff --git a/web/modules/rhn/RHN/Kickstart.pm b/web/modules/rhn/RHN/Kickstart.pm
index d0f0d9e..b241029 100644
--- a/web/modules/rhn/RHN/Kickstart.pm
+++ b/web/modules/rhn/RHN/Kickstart.pm
@@ -25,80 +25,4 @@ our @ISA = qw/RHN::DB::Kickstart/;
use RHN::Kickstart::Commands;
use RHN::Kickstart::Packages;
-use RHN::SessionSwap;
-
-use PXT::Utils;
-
-our @simple_struct_fields = @RHN::DB::Kickstart::simple_struct_fields;
-
-sub render {
- my $self = shift;
-
- my $text = shift || <<EOQ;
-# Kickstart config file generated by RHN Config Management
-#
-# Profile Name: {kickstart_name}
-# Profile Label: {kickstart_label}
-#
-{kickstart_commands}
-
-%packages {kickstart_package_options}
-
-{kickstart_packages}
-
-%pre
-{kickstart_pre}
-
-{kickstart_interpreter_pre}
-
-%post --nochroot
-{kickstart_nochroot_post}
-
-{kickstart_interpreter_post}
-
-%post
-{kickstart_post}
-# end of generated kickstart file
-EOQ
-
- my %subs;
-
- $subs{"kickstart_${_}"} = $self->$_ foreach qw/name label pre post
nochroot_post/;
- $subs{kickstart_commands} = $self->commands ? $self->commands->render : '#
No commands section defined for kickstart profile';
- $subs{kickstart_package_options} = $self->render_package_options || '';
- $subs{kickstart_packages} = $self->packages->render || '';
- $subs{kickstart_interpreter_post} = $self->render_interpreter_post || '';
- $subs{kickstart_interpreter_pre} = $self->render_interpreter_pre || '';
-
- my $ret = PXT::Utils->perform_substitutions($text, \%subs);
-
- return $ret;
-}
-
-sub render_package_options {
- my $self = shift;
-
- my $options = join(" ", map { "--${_}" }
@{$self->package_options}) || '';
-
- return $options;
-}
-
-sub render_interpreter_post {
- my $self = shift;
- my $post = '';
- $post = '%post --interpreter '
- . $self->interpreter_post_val
- . "\n" . $self->interpreter_post_script if
$self->interpreter_post_val;
- return $post;
-}
-
-sub render_interpreter_pre {
- my $self = shift;
- my $pre = '';
- $pre = '%pre --interpreter '
- . $self->interpreter_pre_val
- . "\n" . $self->interpreter_pre_script if $self->interpreter_pre_val;
- return $pre;
-}
-
1;
commit 599206668c72e2ed64c4c24699cba4fb7f6efecc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 11:49:24 2010 +0100
RHN::Kickstart's get_timezone not used anywhere, removing, together with
@timezones and timezones.
diff --git a/web/modules/rhn/RHN/Kickstart.pm b/web/modules/rhn/RHN/Kickstart.pm
index 3502ec6..d0f0d9e 100644
--- a/web/modules/rhn/RHN/Kickstart.pm
+++ b/web/modules/rhn/RHN/Kickstart.pm
@@ -101,396 +101,4 @@ sub render_interpreter_pre {
return $pre;
}
-sub get_timezone {
- my $self = shift;
-
- return unless $self->commands;
-
- my $zn = $self->commands->timezone || '';
-
- my @opts = @{$zn};
- $zn = $opts[-1];
-
- return ( grep { $zn eq $_ } $self->timezones ) ? $zn : 'America/New_York';
-}
-
-my @timezones = qw|Europe/Andorra
-Asia/Dubai
-Asia/Kabul
-America/Antigua
-America/Anguilla
-Europe/Tirane
-Asia/Yerevan
-America/Curacao
-Africa/Luanda
-Antarctica/McMurdo
-Antarctica/South_Pole
-Antarctica/Palmer
-Antarctica/Mawson
-Antarctica/Davis
-Antarctica/Casey
-Antarctica/Vostok
-Antarctica/DumontDUrville
-Antarctica/Syowa
-America/Buenos_Aires
-America/Cordoba
-America/Jujuy
-America/Catamarca
-America/Mendoza
-Pacific/Pago_Pago
-Europe/Vienna
-Australia/Lord_Howe
-Australia/Hobart
-Australia/Melbourne
-Australia/Sydney
-Australia/Broken_Hill
-Australia/Brisbane
-Australia/Lindeman
-Australia/Adelaide
-Australia/Darwin
-Australia/Perth
-America/Aruba
-Asia/Baku
-Europe/Sarajevo
-America/Barbados
-Asia/Dhaka
-Europe/Brussels
-Africa/Ouagadougou
-Europe/Sofia
-Asia/Bahrain
-Africa/Bujumbura
-Africa/Porto-Novo
-Atlantic/Bermuda
-Asia/Brunei
-America/La_Paz
-America/Noronha
-America/Belem
-America/Fortaleza
-America/Recife
-America/Araguaina
-America/Maceio
-America/Sao_Paulo
-America/Cuiaba
-America/Porto_Velho
-America/Boa_Vista
-America/Manaus
-America/Eirunepe
-America/Rio_Branco
-America/Nassau
-Asia/Thimphu
-Africa/Gaborone
-Europe/Minsk
-America/Belize
-America/St_Johns
-America/Halifax
-America/Glace_Bay
-America/Goose_Bay
-America/Montreal
-America/Nipigon
-America/Thunder_Bay
-America/Pangnirtung
-America/Iqaluit
-America/Rankin_Inlet
-America/Winnipeg
-America/Rainy_River
-America/Cambridge_Bay
-America/Regina
-America/Swift_Current
-America/Edmonton
-America/Yellowknife
-America/Inuvik
-America/Dawson_Creek
-America/Vancouver
-America/Whitehorse
-America/Dawson
-Indian/Cocos
-Africa/Kinshasa
-Africa/Lubumbashi
-Africa/Bangui
-Africa/Brazzaville
-Europe/Zurich
-Africa/Abidjan
-Pacific/Rarotonga
-America/Santiago
-Pacific/Easter
-Africa/Douala
-Asia/Shanghai
-Asia/Harbin
-Asia/Chongqing
-Asia/Urumqi
-Asia/Kashgar
-America/Bogota
-America/Costa_Rica
-America/Havana
-Atlantic/Cape_Verde
-Indian/Christmas
-Asia/Nicosia
-Europe/Prague
-Europe/Berlin
-Africa/Djibouti
-Europe/Copenhagen
-America/Dominica
-America/Santo_Domingo
-Africa/Algiers
-America/Guayaquil
-Pacific/Galapagos
-Europe/Tallinn
-Africa/Cairo
-Africa/El_Aaiun
-Africa/Asmera
-Europe/Madrid
-Africa/Ceuta
-Atlantic/Canary
-Africa/Addis_Ababa
-Europe/Helsinki
-Pacific/Fiji
-Atlantic/Stanley
-Pacific/Yap
-Pacific/Truk
-Pacific/Ponape
-Pacific/Kosrae
-Atlantic/Faeroe
-Europe/Paris
-Africa/Libreville
-Europe/London
-Europe/Belfast
-America/Grenada
-Asia/Tbilisi
-America/Cayenne
-Africa/Accra
-Europe/Gibraltar
-America/Godthab
-America/Danmarkshavn
-America/Scoresbysund
-America/Thule
-Africa/Banjul
-Africa/Conakry
-America/Guadeloupe
-Africa/Malabo
-Europe/Athens
-Atlantic/South_Georgia
-America/Guatemala
-Pacific/Guam
-Africa/Bissau
-America/Guyana
-Asia/Hong_Kong
-America/Tegucigalpa
-Europe/Zagreb
-America/Port-au-Prince
-Europe/Budapest
-Asia/Jakarta
-Asia/Pontianak
-Asia/Makassar
-Asia/Jayapura
-Europe/Dublin
-Asia/Jerusalem
-Asia/Calcutta
-Indian/Chagos
-Asia/Baghdad
-Asia/Tehran
-Atlantic/Reykjavik
-Europe/Rome
-America/Jamaica
-Asia/Amman
-Asia/Tokyo
-Africa/Nairobi
-Asia/Bishkek
-Asia/Phnom_Penh
-Pacific/Tarawa
-Pacific/Enderbury
-Pacific/Kiritimati
-Indian/Comoro
-America/St_Kitts
-Asia/Pyongyang
-Asia/Seoul
-Asia/Kuwait
-America/Cayman
-Asia/Almaty
-Asia/Qyzylorda
-Asia/Aqtobe
-Asia/Aqtau
-Asia/Oral
-Asia/Vientiane
-Asia/Beirut
-America/St_Lucia
-Europe/Vaduz
-Asia/Colombo
-Africa/Monrovia
-Africa/Maseru
-Europe/Vilnius
-Europe/Luxembourg
-Europe/Riga
-Africa/Tripoli
-Africa/Casablanca
-Europe/Monaco
-Europe/Chisinau
-Indian/Antananarivo
-Pacific/Majuro
-Pacific/Kwajalein
-Europe/Skopje
-Africa/Bamako
-Africa/Timbuktu
-Asia/Rangoon
-Asia/Ulaanbaatar
-Asia/Hovd
-Asia/Choibalsan
-Asia/Macau
-Pacific/Saipan
-America/Martinique
-Africa/Nouakchott
-America/Montserrat
-Europe/Malta
-Indian/Mauritius
-Indian/Maldives
-Africa/Blantyre
-America/Mexico_City
-America/Cancun
-America/Merida
-America/Monterrey
-America/Mazatlan
-America/Chihuahua
-America/Hermosillo
-America/Tijuana
-Asia/Kuala_Lumpur
-Asia/Kuching
-Africa/Maputo
-Africa/Windhoek
-Pacific/Noumea
-Africa/Niamey
-Pacific/Norfolk
-Africa/Lagos
-America/Managua
-Europe/Amsterdam
-Europe/Oslo
-Asia/Katmandu
-Pacific/Nauru
-Pacific/Niue
-Pacific/Auckland
-Pacific/Chatham
-Asia/Muscat
-America/Panama
-America/Lima
-Pacific/Tahiti
-Pacific/Marquesas
-Pacific/Gambier
-Pacific/Port_Moresby
-Asia/Manila
-Asia/Karachi
-Europe/Warsaw
-America/Miquelon
-Pacific/Pitcairn
-America/Puerto_Rico
-Asia/Gaza
-Europe/Lisbon
-Atlantic/Madeira
-Atlantic/Azores
-Pacific/Palau
-America/Asuncion
-Asia/Qatar
-Indian/Reunion
-Europe/Bucharest
-Europe/Kaliningrad
-Europe/Moscow
-Europe/Samara
-Asia/Yekaterinburg
-Asia/Omsk
-Asia/Novosibirsk
-Asia/Krasnoyarsk
-Asia/Irkutsk
-Asia/Yakutsk
-Asia/Vladivostok
-Asia/Sakhalin
-Asia/Magadan
-Asia/Kamchatka
-Asia/Anadyr
-Africa/Kigali
-Asia/Riyadh
-Pacific/Guadalcanal
-Indian/Mahe
-Africa/Khartoum
-Europe/Stockholm
-Asia/Singapore
-Atlantic/St_Helena
-Europe/Ljubljana
-Arctic/Longyearbyen
-Atlantic/Jan_Mayen
-Europe/Bratislava
-Africa/Freetown
-Europe/San_Marino
-Africa/Dakar
-Africa/Mogadishu
-America/Paramaribo
-Africa/Sao_Tome
-America/El_Salvador
-Asia/Damascus
-Africa/Mbabane
-America/Grand_Turk
-Africa/Ndjamena
-Indian/Kerguelen
-Africa/Lome
-Asia/Bangkok
-Asia/Dushanbe
-Pacific/Fakaofo
-Asia/Ashgabat
-Africa/Tunis
-Pacific/Tongatapu
-Asia/Dili
-Europe/Istanbul
-America/Port_of_Spain
-Pacific/Funafuti
-Asia/Taipei
-Africa/Dar_es_Salaam
-Europe/Kiev
-Europe/Uzhgorod
-Europe/Zaporozhye
-Europe/Simferopol
-Africa/Kampala
-Pacific/Johnston
-Pacific/Midway
-Pacific/Wake
-America/New_York
-America/Detroit
-America/Louisville
-America/Kentucky/Monticello
-America/Indianapolis
-America/Indiana/Marengo
-America/Indiana/Knox
-America/Indiana/Vevay
-America/Chicago
-America/Menominee
-America/North_Dakota/Center
-America/Denver
-America/Boise
-America/Shiprock
-America/Phoenix
-America/Los_Angeles
-America/Anchorage
-America/Juneau
-America/Yakutat
-America/Nome
-America/Adak
-Pacific/Honolulu
-America/Montevideo
-Asia/Samarkand
-Asia/Tashkent
-Europe/Vatican
-America/St_Vincent
-America/Caracas
-America/Tortola
-America/St_Thomas
-Asia/Saigon
-Pacific/Efate
-Pacific/Wallis
-Pacific/Apia
-Asia/Aden
-Indian/Mayotte
-Europe/Belgrade
-Africa/Johannesburg
-Africa/Lusaka
-Africa/Harare|;
-
-sub timezones {
- return @timezones;
-}
-
1;
commit 8345fd06ed953e2b48874b0baa7de8c516089283
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 11:46:35 2010 +0100
Methods set_zerombr, set_bootloader, get_bootloader, set_timezone, is_timezone_utc,
and set_partition_info are not used, removing.
diff --git a/web/modules/rhn/RHN/Kickstart.pm b/web/modules/rhn/RHN/Kickstart.pm
index a86a3f0..3502ec6 100644
--- a/web/modules/rhn/RHN/Kickstart.pm
+++ b/web/modules/rhn/RHN/Kickstart.pm
@@ -101,77 +101,6 @@ sub render_interpreter_pre {
return $pre;
}
-sub set_zerombr {
- my $self = shift;
- my $on = shift;
-
- return unless $self->commands;
-
- if (defined $on and $on ne 'no') {
- $self->commands->set(zerombr => 'yes');
- }
- else {
- $self->commands->unset('zerombr');
- }
-
- return;
-}
-
-sub set_bootloader {
- my $self = shift;
- my %params = validate(@_, { bootloader => 1, append => 0, driveorder => 0,
location => 0,
- password => 0, md5pass => 0, upgrade => 0 });
-
- return unless $self->commands;
-
- my $location = $params{location} ? $params{location} : 'mbr';
- $location = 'mbr' unless (grep { $location eq $_ } qw/mbr partition none/);
- $location = '--location ' . $location;
-
- my $uselilo = ($params{bootloader} eq 'lilo') ? '--useLilo ' :
'';
-
- my $extra;
-
- foreach my $key (qw/append driveorder password md5pass upgrade/) {
- if ($params{$key}) {
- $extra .= "--$key $params{$key}";
- }
- elsif (exists $params{$key}) {
- $extra .= "--$key";
- }
- }
-
- $extra = " " . $extra if $extra;
-
- $self->commands->bootloader("${uselilo}${location}${extra}");
-
- return;
-}
-
-sub get_bootloader {
- my $self = shift;
-
- return unless $self->commands;
-
- my $bl = $self->commands->bootloader;
- my @opts = @{$bl};
- return (grep { $_ =~ /lilo/i } @opts) ? 'lilo' : 'grub';
-}
-
-sub set_timezone {
- my $self = shift;
- my %params = validate(@_, { zone => 1, hardware_utc => 0 });
-
- return unless $self->commands;
-
- $params{zone} = 'America/New_York' unless (grep { $params{zone} eq $_ }
$self->timezones);
- my $utc = $params{hardware_utc} ? '--utc ' : '';
-
- $self->commands->timezone($utc . $params{zone});
-
- return;
-}
-
sub get_timezone {
my $self = shift;
@@ -185,58 +114,6 @@ sub get_timezone {
return ( grep { $zn eq $_ } $self->timezones ) ? $zn : 'America/New_York';
}
-sub is_timezone_utc {
- my $self = shift;
-
- return unless $self->commands;
-
- my $zn = $self->commands->timezone || '';
-
- foreach my $opt (@{$zn}) {
- return 1 if ($opt eq '--utc');
- }
-
- return;
-}
-
-sub set_partition_info {
- my $self = shift;
- my %params = validate(@_, { parts => 1 });
-
- return unless $self->commands;
- my (@parts, @raids, @volgroups, @logvols, @include);
- foreach my $line (split /\n/, $params{parts}) {
- if ($line =~ /^part\S*\s+(.*)$/) {
- my $part = $1;
- push @parts, [ split /\s+/, $part ];
- }
- elsif ($line =~ /^raid\s+(.*)$/) {
- my $raid = $1;
- push @raids, [ split /\s+/, $raid ];
- }
- elsif ($line =~ /^volgroup\s+(.*)$/) {
- my $group = $1;
- push @volgroups, [ split /\s+/, $group ];
- }
- elsif ($line =~ /^logvol\s+(.*)$/) {
- my $vol = $1;
- push @logvols, [ split /\s+/, $vol ];
- }
- elsif ($line =~ /^\%?include\s+(.*)$/) {
- my $inc = $1;
- push @include, [ split /\s+/, $inc];
- }
- }
-
- $self->commands->partitions(new RHN::Kickstart::Partitions(@parts));
- $self->commands->raids(new RHN::Kickstart::Raids(@raids));
- $self->commands->volgroups(new RHN::Kickstart::Volgroups(@volgroups));
- $self->commands->logvols(new RHN::Kickstart::Logvols(@logvols));
- $self->commands->include(new RHN::Kickstart::Include(@include));
-
- return;
-}
-
my @timezones = qw|Europe/Andorra
Asia/Dubai
Asia/Kabul