summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-02-20 15:52:25 +0000
committerFrancois Pons <fpons@mandriva.com>2003-02-20 15:52:25 +0000
commita3ceb8beb32a0d66db856808deaa1d5364c8b9af (patch)
treeaaae853057b48f1b934c975ba0692daea2105bd7
parentc7a3bffefde94f2c6a2c0f6bfbe1009c4d9a76fe (diff)
downloadurpmi-a3ceb8beb32a0d66db856808deaa1d5364c8b9af.tar
urpmi-a3ceb8beb32a0d66db856808deaa1d5364c8b9af.tar.gz
urpmi-a3ceb8beb32a0d66db856808deaa1d5364c8b9af.tar.bz2
urpmi-a3ceb8beb32a0d66db856808deaa1d5364c8b9af.tar.xz
urpmi-a3ceb8beb32a0d66db856808deaa1d5364c8b9af.zip
4.2-20mdk
-rw-r--r--urpm.pm5
-rwxr-xr-xurpmi3
-rw-r--r--urpmi.spec5
3 files changed, 9 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 9712d528..e1b855ae 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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});
diff --git a/urpmi b/urpmi
index cbdad21f..5b71cadd 100755
--- a/urpmi
+++ b/urpmi
@@ -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) {
diff --git a/urpmi.spec b/urpmi.spec
index 2944e693..ea92da8a 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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.