summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-24 08:54:39 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-24 08:54:39 +0000
commitb3e8cdcc5a896bda62c3af20168d2bcf0d4a4488 (patch)
tree5a933a53bdc3dbf9c7567be3d179b9715e404581 /perl-install/install_any.pm
parent84f64dbd753d1fbfc2bc9af0de31d47d16ee14c4 (diff)
downloaddrakx-b3e8cdcc5a896bda62c3af20168d2bcf0d4a4488.tar
drakx-b3e8cdcc5a896bda62c3af20168d2bcf0d4a4488.tar.gz
drakx-b3e8cdcc5a896bda62c3af20168d2bcf0d4a4488.tar.bz2
drakx-b3e8cdcc5a896bda62c3af20168d2bcf0d4a4488.tar.xz
drakx-b3e8cdcc5a896bda62c3af20168d2bcf0d4a4488.zip
Modernize, remove old code
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm17
1 files changed, 8 insertions, 9 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 686502848..dec369cdc 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -2,13 +2,11 @@ package install_any; # $Id$
use strict;
-use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $boot_medium $current_medium $asked_medium @advertising_images);
-
-@ISA = qw(Exporter);
-%EXPORT_TAGS = (
+our @ISA = qw(Exporter);
+our %EXPORT_TAGS = (
all => [ qw(getNextStep spawnShell addToBeDone) ],
);
-@EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
+our @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
#-######################################################################################
#- misc imports
@@ -28,10 +26,12 @@ use any;
use log;
#- boot medium (the first medium to take into account).
-$boot_medium = 1;
-$current_medium = $boot_medium;
-$asked_medium = $boot_medium;
+our $boot_medium = 1;
+our $current_medium = $boot_medium;
+our $asked_medium = $boot_medium;
+our @advertising_images;
+#- current ftp root (for getFile) �- XXX must store this per media
our $global_ftp_prefix;
sub drakx_version() {
@@ -236,7 +236,6 @@ sub getFile {
my $f2 = "$postinstall_rpms/$f";
$o_altroot ||= '/tmp/image';
$f2 = "$o_altroot/$rel" if $rel !~ m,^/, && (!$postinstall_rpms || !-e $f2);
- #- $f2 = "/$rel" if !$::o->{packages}{mediums}{$asked_medium}{rpmsdir} && !-e $f2; #- not a relative path, should not be necessary with new media layout
my $F; open($F, $f2) ? $F : do { $f2 !~ /XXX/ and log::l("Can not open $f2: $!"); undef };
}
} || errorOpeningFile($f);