From 9296c5526eac40af67f7b47ed0f7fc769f7ac96f Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 4 Mar 2002 13:03:52 +0000 Subject: 3.3-18mdk --- man/C/urpmq.8 | 5 +++-- urpmi | 4 +++- urpmi.spec | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/man/C/urpmq.8 b/man/C/urpmq.8 index 6dae76bb..b27169a3 100644 --- a/man/C/urpmq.8 +++ b/man/C/urpmq.8 @@ -50,9 +50,10 @@ if maximal closure is used, assume that a package listed mey have wrong or not up-to-date dependancies. This cause more package to be upgraded and may correct unresolved dependancies on the rpm database. .IP "\fB\-p\fP" -allow search in provides to find package (default). +allow search in provides to find package. .IP "\fB\-P\fP" -do not search in provides to find package (this is the opposite of \fB-p\fP). +do not search in provides to find package (this is the opposite of \fB-p\fP and +is the default). .IP "\fB\-y\fP" this is the same as \fB--fuzzy\fP. .IP "\fB\-s\fP" diff --git a/urpmi b/urpmi index 139c1b06..2bd36d11 100755 --- a/urpmi +++ b/urpmi @@ -379,7 +379,9 @@ if (@rpms_install || @rpms_upgrade) { system("grpmi", $WID ? ("--WID=$WID") : (), (map { ("-noupgrade", $_) } @rpms_install), @rpms_upgrade); if ($?) { - message(_("Installation failed")); #- grpmi handles --nodeps and --force by itself, + #- grpmi handles --nodeps and --force by itself, + #- and $WID is defined when integrated in rpminst. + $WID or message(_("Installation failed")); exit(($? >> 8) + 32); #- forward grpmi error + 32 } } else { diff --git a/urpmi.spec b/urpmi.spec index b4cdded0..6b2a08c7 100644 --- a/urpmi.spec +++ b/urpmi.spec @@ -2,7 +2,7 @@ Name: urpmi Version: 3.3 -Release: 17mdk +Release: 18mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -144,6 +144,9 @@ fi %changelog +* Mon Mar 4 2002 François Pons 3.3-18mdk +- added patch from Andrej Borksenkow modified. + * Thu Feb 28 2002 François Pons 3.3-17mdk - added (undocumented) --root option to urpmi/urpmq to install in a given root. -- cgit v1.2.1