diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-05-09 15:30:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-05-09 15:30:44 +0000 |
| commit | 2d7225043e251c0257713c791c648c6ae821ab7f (patch) | |
| tree | 9f2b876954b04fdaa8d8a658bbe1ddd892388b70 | |
| parent | 01b47be3701dced43e6f4f53da2278c9d5902e52 (diff) | |
| download | drakx-2d7225043e251c0257713c791c648c6ae821ab7f.tar drakx-2d7225043e251c0257713c791c648c6ae821ab7f.tar.gz drakx-2d7225043e251c0257713c791c648c6ae821ab7f.tar.bz2 drakx-2d7225043e251c0257713c791c648c6ae821ab7f.tar.xz drakx-2d7225043e251c0257713c791c648c6ae821ab7f.zip | |
- do not ask for updates at end of installation when updates are already
available (network installs) (#30344)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 3badb7bbd..efbe64b7f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- do not ask for updates at end of installation when updates are already + available (network installs) (#30344) - do not try to configure dvd devices since /dev is wiped out at reboot - allow umounting cdrom during a transaction - really allow having name with "/" in media.cfg diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index b196dbdcb..5a1deb0b3 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -635,6 +635,12 @@ sub installUpdates { $o->hasNetwork or return; + if (install::any::is_network_install($o) && + find { $_->{update} } install::media::allMediums($o->{packages})) { + log::l("installUpdates: skipping since updates were already available during install"); + return; + } + $o->ask_yesorno_({ title => N("Updates"), icon => 'banner-update', messages => formatAlaTeX( N("You now have the opportunity to download updated packages. These packages have been updated after the distribution was released. They may |