diff options
| -rw-r--r-- | urpm.pm | 5 | ||||
| -rwxr-xr-x | urpmi | 3 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -1945,6 +1945,9 @@ sub search_packages { sub resolve_dependencies { my ($urpm, $state, $requested, %options) = @_; + #- needed for both parallel mode or simple mode. + require URPM::Resolve; + if ($options{install_src}) { #- only src will be installed, so only update $state->{selected} according #- to src status of files. @@ -1967,8 +1970,6 @@ sub resolve_dependencies { } else { my $db; - require URPM::Resolve; - if ($options{rpmdb}) { $db = new URPM; $db->parse_synthesis($options{rpmdb}); @@ -499,7 +499,8 @@ my %sources = $urpm->download_source_packages($local_sources, $list, print SAVEERR " " x 79, "\r"; } }, - force_local => !$X, ask_for_medium => (!$auto || $allow_medium_change) && sub { + force_local => !$X || $parallel, + ask_for_medium => (!$auto || $allow_medium_change) && sub { my $msg = _("Please insert the medium named \"%s\" on device [%s]", @_); my $msg2 = _("Press Enter when ready..."); if ($X) { @@ -2,7 +2,7 @@ Name: urpmi Version: 4.2 -Release: 19mdk +Release: 20mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -206,6 +206,9 @@ fi %changelog +* Thu Feb 20 2003 François Pons <fpons@mandrakesoft.com> 4.2-20mdk +- fixed bug 1737 and 1816. + * Mon Feb 17 2003 François Pons <fpons@mandrakesoft.com> 4.2-19mdk - fixed bug 1719 (ssh distributed mode not working). - fixed english typo. |