summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-18 05:20:25 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-18 05:20:25 +0000
commit622997696fb4a7bcedee2b81ddcf07598c3d2e52 (patch)
treeec7368c8012d9b8b01073be635e0d77115fb4612 /perl-install/install_steps_gtk.pm
parenta989352435472bfc67bc0ef5ea00f8c78ac70ecd (diff)
downloaddrakx-622997696fb4a7bcedee2b81ddcf07598c3d2e52.tar
drakx-622997696fb4a7bcedee2b81ddcf07598c3d2e52.tar.gz
drakx-622997696fb4a7bcedee2b81ddcf07598c3d2e52.tar.bz2
drakx-622997696fb4a7bcedee2b81ddcf07598c3d2e52.tar.xz
drakx-622997696fb4a7bcedee2b81ddcf07598c3d2e52.zip
in disk-iso install, automatically choose and change ISO images, according to their volume id and application id
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm25
1 files changed, 14 insertions, 11 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 6c97db1f8..7ee2212c0 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -590,20 +590,23 @@ sub installPackages {
*install_any::changeMedium = sub {
my ($method, $medium) = @_;
- #- if not using a cdrom medium, always abort.
- if ($method eq 'cdrom' && !$::oem) {
- my $name = pkgs::mediumDescr($o->{packages}, $medium);
- local $| = 1; print "\a";
- my $time = time();
- my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
- $r &&= $o->ask_okcancel('', N("Change your Cd-Rom!
-
+ #- if not using a cdrom medium or an iso image, always abort.
+ return unless $method =~ /(^cdrom|-iso)$/ && !$::oem;
+
+ my $name = pkgs::mediumDescr($o->{packages}, $medium);
+ local $| = 1; print "\a";
+ my $time = time();
+ my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
+ if ($method =~ /-iso$/) {
+ $r = install_any::changeIso($name);
+ } else {
+ $r &&= $o->ask_okcancel('', N("Change your Cd-Rom!
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1);
- #- add the elapsed time (otherwise the predicted time will be rubbish)
- $start_time += time() - $time;
- return $r;
}
+ #- add the elapsed time (otherwise the predicted time will be rubbish)
+ $start_time += time() - $time;
+ return $r;
};
my $install_result;
catch_cdie { $install_result = $o->install_steps::installPackages($packages) }