summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-15 12:27:57 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-15 12:27:57 +0000
commiteec3a9934a50e0b1fc7407da1401c3b6ebb6ce46 (patch)
treedc390706662351399feae9d27e9d579593cbd894
parent2dc149fa7184d903d209f24fd5b74e2747ef643a (diff)
downloaddrakx-eec3a9934a50e0b1fc7407da1401c3b6ebb6ce46.tar
drakx-eec3a9934a50e0b1fc7407da1401c3b6ebb6ce46.tar.gz
drakx-eec3a9934a50e0b1fc7407da1401c3b6ebb6ce46.tar.bz2
drakx-eec3a9934a50e0b1fc7407da1401c3b6ebb6ce46.tar.xz
drakx-eec3a9934a50e0b1fc7407da1401c3b6ebb6ce46.zip
Change the name of the directory where the rpms are copied
-rw-r--r--perl-install/install_any.pm10
-rw-r--r--perl-install/install_steps_gtk.pm2
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f37d7006e..f9887706d 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -708,7 +708,7 @@ sub cp_with_progress {
sub copy_rpms_on_disk {
my ($o) = @_;
- mkdir "$o->{prefix}/$_", 0755 foreach qw(var var/ftp var/ftp/pub var/ftp/pub/Mandrakelinux var/ftp/pub/Mandrakelinux/media);
+ mkdir "$o->{prefix}/$_", 0755 foreach qw(var var/ftp var/ftp/pub var/ftp/pub/Mandrivalinux var/ftp/pub/Mandrivalinux/media);
local *changeMedium = sub {
my ($method, $medium) = @_;
my $name = pkgs::mediumDescr($o->{packages}, $medium);
@@ -744,14 +744,14 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
} while !-d "/tmp/image/$m->{rpmsdir}";
$current_medium = $k;
}
- log::l("copying /tmp/image/$m->{rpmsdir} to $o->{prefix}/var/ftp/pub/Mandrakelinux/media");
+ log::l("copying /tmp/image/$m->{rpmsdir} to $o->{prefix}/var/ftp/pub/Mandrivalinux/media");
my $total = count_files("/tmp/image/$m->{rpmsdir}");
log::l("($total files)");
eval {
- cp_with_progress($wait_message, 0, $total, "/tmp/image/$m->{rpmsdir}", "$o->{prefix}/var/ftp/pub/Mandrakelinux/media");
+ cp_with_progress($wait_message, 0, $total, "/tmp/image/$m->{rpmsdir}", "$o->{prefix}/var/ftp/pub/Mandrivalinux/media");
};
log::l($@) if $@;
- $m->{prefix} = "$o->{prefix}/var/ftp/pub/Mandrakelinux";
+ $m->{prefix} = "$o->{prefix}/var/ftp/pub/Mandrivalinux";
$m->{method} = 'disk';
$m->{with_hdlist} = 'media_info/hdlist.cz'; #- for install_urpmi
undef $wait_w;
@@ -1009,7 +1009,7 @@ sub install_urpmi {
my $name = $_->{fakemedium};
if ($_->{ignored} || $_->{selected}) {
my $curmethod = $_->{method} || $::o->{method};
- my $dir = (($copied_rpms_on_disk ? "/var/ftp/pub/Mandrakelinux" : '')
+ my $dir = (($copied_rpms_on_disk ? "/var/ftp/pub/Mandrivalinux" : '')
|| $_->{prefix} || ${{ nfs => "file://mnt/nfs",
disk => "file:/" . $hdInstallPath,
ftp => $ENV{URLPREFIX},
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 8ef0d9bb7..fc6648283 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -670,7 +670,7 @@ sub deselectFoundMedia {
}
if ($ask_copy_rpms_on_disk) {
#- don't be afraid, cleanup old RPMs if upgrade
- eval { rm_rf("$::prefix/var/ftp/pub/Mandrakelinux") if $o->{isUpgrade} };
+ eval { rm_rf("$::prefix/var/ftp/pub/Mandrakelinux", "$::prefix/var/ftp/pub/Mandrivalinux") if $o->{isUpgrade} };
my $w = ugtk2->new("");
$i = -1;
$w->sync;