summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-18 16:48:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-18 16:48:57 +0000
commit4fa55b5793ef632fdf745e0d78c4f930743fa5e1 (patch)
tree7511ea512b90efa4a86ef3368ab8a9db71bf2199 /perl-install
parent8d3e07a6988c9d46122ee6548a1b153048ffeb20 (diff)
downloaddrakx-4fa55b5793ef632fdf745e0d78c4f930743fa5e1.tar
drakx-4fa55b5793ef632fdf745e0d78c4f930743fa5e1.tar.gz
drakx-4fa55b5793ef632fdf745e0d78c4f930743fa5e1.tar.bz2
drakx-4fa55b5793ef632fdf745e0d78c4f930743fa5e1.tar.xz
drakx-4fa55b5793ef632fdf745e0d78c4f930743fa5e1.zip
use $::prefix instead of $::o->{prefix}
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/install_any.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index d982226e6..c2e853694 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -139,7 +139,7 @@ sub group_n_lm {
}
sub screenshot_dir__and_move {
- my ($dir1, $dir2) = ("$::o->{prefix}/root", '/tmp/stage2');
+ my ($dir1, $dir2) = ("$::prefix/root", '/tmp/stage2');
if (-e $dir1) {
if (-e "$dir2/DrakX-screenshots") {
cp_af("$dir2/DrakX-screenshots", $dir1);
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 401de60ef..ab89918d6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -41,7 +41,7 @@ my $cdrom = undef;
sub useMedium($) {
#- before ejecting the first CD, there are some files to copy!
#- does nothing if the function has already been called.
- $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+ $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::prefix, $::o->{packages});
$asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
$asked_medium = $_[0];
@@ -501,7 +501,7 @@ sub setupFB {
sub hdInstallPath() {
my $tail = first(readlink("/tmp/image") =~ m|^/tmp/hdimage/(.*)|);
- my $head = first(readlink("/tmp/hdimage") =~ m|$::o->{prefix}(.*)|);
+ my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|);
$tail && ($head ? "$head/$tail" : "/mnt/hd/$tail");
}
@@ -628,7 +628,7 @@ sub kdemove_desktop_file {
#-###############################################################################
#- auto_install stuff
#-###############################################################################
-sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root/drakx") . "/auto_inst.cfg.pl" }
+sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::prefix/root/drakx") . "/auto_inst.cfg.pl" }
sub report_bug {
my ($prefix) = @_;