diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2006-03-03 20:24:57 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2006-03-03 20:24:57 +0000 |
commit | 3c245a7559fe40074270841d3504bd6a01369d94 (patch) | |
tree | 799d70dbf826ca3914435454dfcb8c2cff24a5db /mdkupdate | |
parent | 5032fe5d15899743af248158312f5092388835b5 (diff) | |
download | mgaonline-3c245a7559fe40074270841d3504bd6a01369d94.tar mgaonline-3c245a7559fe40074270841d3504bd6a01369d94.tar.gz mgaonline-3c245a7559fe40074270841d3504bd6a01369d94.tar.bz2 mgaonline-3c245a7559fe40074270841d3504bd6a01369d94.tar.xz mgaonline-3c245a7559fe40074270841d3504bd6a01369d94.zip |
only use --auto-select if asked for
Diffstat (limited to 'mdkupdate')
-rwxr-xr-x | mdkupdate | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -155,7 +155,7 @@ You need to update to a newer version. You can get a new one from http://start.m add_media($_, $mirrors{$_}, 'media_info/hdlist.cz', '') foreach keys %mirrors; $bundle =~ s/\.rpm$//; push @bundles, $bundle; - install_pkgs($in, \@bundles, (find { /^bundle/ } keys %mirrors), { is_bundle => 1 }); + install_pkgs($in, \@bundles, (find { /^bundle/ } keys %mirrors), { is_bundle => 1, auto_select => ($wc->{POST} =~ /AUTO_SELECT/) }); } else { $in->ask_warn(N("Error"), N("An error occurred") . "\n\n" . $bundle_info->{message}); } @@ -191,7 +191,7 @@ sub install_pkgs { my $w = $in->wait_message(N("Please wait"), N("Installing packages ...\n")); eval { system "/usr/sbin/urpmi", "--auto", "--media", $media_name, @$choosed; - system "/usr/sbin/urpmi", "--auto-select", "--media", $media_name if $o_options->{is_bundle}; + system "/usr/sbin/urpmi", if_($o_options->{auto_select}, "--auto-select"), "--media", $media_name if $o_options->{is_bundle}; $? == 0 or die N("Unable to update packages from update_source medium.\n"); }; undef $w; |