*** empty log message ***

4 files changed, 9 insertions, 4 deletions

diff --git a/urpm.pm b/urpm.pm
index 8ad3c2e1..6527815d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1343,7 +1343,7 @@ sub upload_source_packages {
 		#- mount everything necessary.
 		unless ($urpm->try_mounting($dir, 'mount')) {
 		    $urpm->try_mounting($dir, 'unmount'); system("eject", $device);
-		    $ask_for_medium->($medium->{name}, $medium->{removable}) or last;
+		    $ask_for_medium->($medium->{name}, $medium->{removable}) or die "removable medium not selected";
 		}
 	    }
 	    if (-e $dir) {
diff --git a/urpmf.8 b/urpmf.8
index 31e8695c..265566ae 100644
--- a/urpmf.8
+++ b/urpmf.8
@@ -9,7 +9,7 @@ urpmf outputs a list of packages providing the file specified as an argument.
 .PP
 <\fIFile\fP> is the name of the file you wish to know the package providing
 it. Note that you may type just a substring of the file you are looking for,
-\fBrpmf\fP will then print a list of matching files with their corresponding
+\fBurpmf\fP will then print a list of matching files with their corresponding
 packages.
 .PP
 urpmf searches through installed and uninstalled packages.
diff --git a/urpmi b/urpmi
index 5a8a19e7..8a073628 100755
--- a/urpmi
+++ b/urpmi
@@ -294,7 +294,7 @@ sub install {
     system($X ? ("grpmi", $WID ? ("--WID=$WID") : ()) : ("rpm", $rpm_opt), @_);
     if ($?) {
 	message(_("Installation failed"));
-	$X and exit 1; #- grpmi handles --nodeps and --force by itself
+	$X and exit ($? >> 8) || 1; #- grpmi handles --nodeps and --force by itself, forward grpmi error.
 
 	m|^/| && !-e $_ and exit 1 foreach @_; #- missing local file
 
diff --git a/urpmi.spec b/urpmi.spec
index 42af95cb..459fe093 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.5
-Release: 31mdk
+Release: 32mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -114,6 +114,11 @@ autoirpm.uninstall
 
 
 %changelog
+* Fri Apr 13 2001 François Pons <fpons@mandrakesoft.com> 1.5-32mdk
+- fixed typo on urpmf man pages.
+- fixed urpmi return exit code of grpmi on error.
+- fixed cancel on medium change dialog (gurpmi or --X).
+
 * Tue Apr 10 2001 François Pons <fpons@mandrakesoft.com> 1.5-31mdk
 - fixed error on .listing file in rpms cache directory.