summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-10 14:07:07 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-10 14:07:07 +0000
commitd0dce57f7da4d1d0e8cbb724b2ae7837d569c396 (patch)
tree8ae778fb1042e18e90519ef15dc13795df9b7ab8 /perl-install
parent0ac8d3acdc6a986d2b7c2f97d515c64875baef9f (diff)
downloaddrakx-d0dce57f7da4d1d0e8cbb724b2ae7837d569c396.tar
drakx-d0dce57f7da4d1d0e8cbb724b2ae7837d569c396.tar.gz
drakx-d0dce57f7da4d1d0e8cbb724b2ae7837d569c396.tar.bz2
drakx-d0dce57f7da4d1d0e8cbb724b2ae7837d569c396.tar.xz
drakx-d0dce57f7da4d1d0e8cbb724b2ae7837d569c396.zip
(installUpdates) add all media instead of only update ones (mga#7959)
rationale: - DVD media are only partial, online media bring all media - nonfree medium on DVD will be partial (only firmware)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b5e16c744..542bdd969 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,8 @@
o blacklist unwanted media instead of whitelisting wanted ones
(fix dual cd where media names are not the regular ones)
o no media is a critical error
+- updates step:
+ o add all media instead of only update ones (mga#7959)
Version 15.6 - 10 December 2012
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 142b87676..a0f2d203f 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -783,7 +783,7 @@ Do you want to install the updates?")),
if (any::urpmi_add_all_media($o, $o->{previous_release})) {
my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi2', 'urpmi' or return;
my $log_file = '/root/drakx/updates.log';
- run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select', '--update');
+ run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');
}
install::pkgs::clean_rpmdb_shared_regions();