summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm10
-rwxr-xr-xurpmi5
-rw-r--r--urpmi.spec7
-rwxr-xr-xurpmq4
4 files changed, 14 insertions, 12 deletions
diff --git a/urpm.pm b/urpm.pm
index 49878631..0048b9a6 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1328,13 +1328,9 @@ sub upload_source_packages {
}
}
}
- if (@distant_sources) {
- local *F;
- open F, "| wget -NP $urpm->{cachedir}/rpms -i -";
- foreach (@distant_sources) {
- print F "$_\n";
- }
- close F or $urpm->{error}("cannot get distant rpms files (maybe wget is missing?)");
+ foreach (@distant_sources) {
+ $urpm->{log}("retrieving [$_]");
+ system "wget", "-NP", "$urpm->{cachedir}/rpms", $_;
}
#- return the list of rpm file that have to be installed, they are all local now.
diff --git a/urpmi b/urpmi
index 9dd69175..228af58f 100755
--- a/urpmi
+++ b/urpmi
@@ -218,7 +218,7 @@ my @to_install;
#- check if there is at least one package to install that
#- has not been given by the user.
-my $ask_user = $auto_select;
+my $ask_user = $auto_select && scalar(keys %packages);
my $sum = 0;
foreach (keys %packages) {
defined $packages{$_} and $ask_user = 1;
@@ -281,6 +281,7 @@ sub install {
printf SAVEOUT sprintf(_("installing %s\n"), join(' ', @_));
log_it(scalar localtime, " @_\n");
+ $urpm->{log}("starting installing packages");
system($X ? "grpmi" : ("rpm", $rpm_opt), @_);
if ($?) {
message(_("Installation failed"));
@@ -292,12 +293,14 @@ sub install {
$yesexpr = _("Yy");
print SAVEOUT _("Try installation without checking dependencies? (y/N) ");
$force or <STDIN> =~ /[$yesexpr]/ or exit 1;
+ $urpm->{log}("starting installing packages without deps");
system("rpm", $rpm_opt, "--nodeps", @_);
if ($?) {
message(_("Installation failed"));
print SAVEOUT _("Try installation even more strongly (--force)? (y/N) ");
$force or <STDIN> =~ /[$yesexpr]/ or exit 0;
+ $urpm->{log}("starting force installing packages without deps");
system("rpm", $rpm_opt, "--nodeps", "--force", @_);
}
}
diff --git a/urpmi.spec b/urpmi.spec
index 6ea49ce3..b69bf7f4 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 1.5
-Release: 18mdk
+Release: 19mdk
License: GPL
Source0: %{name}.tar.bz2
Summary: User mode rpm install
@@ -113,6 +113,11 @@ autoirpm.uninstall
%changelog
+* Wed Mar 7 2001 François Pons <fpons@mandrakesoft.com> 1.5-19mdk
+- fixed default -m mode for urpmq.
+- added log for getting packages (wget) and installing them.
+- avoid asking user if everything is already installed.
+
* Wed Mar 7 2001 François Pons <fpons@mandrakesoft.com> 1.5-18mdk
- fixed last line not printed for rpm output.
diff --git a/urpmq b/urpmq
index 74fd674e..84af61cb 100755
--- a/urpmq
+++ b/urpmq
@@ -31,9 +31,7 @@ import Locale::GetText I_;
*_ = *I_;
#- default options.
-my $query = {
- minimal => 1,
- };
+my $query;
my @files;
my @names;