aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrpmdrake6
-rw-r--r--rpmdrake.spec7
2 files changed, 9 insertions, 4 deletions
diff --git a/rpmdrake b/rpmdrake
index 1e44c5de..0275c36d 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1129,10 +1129,10 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
}
if (@rpms_install || @rpms_upgrade) {
- foreach (@rpms_install, @rpms_upgrade) {
- m|^/| && ! -e $_ or next;
+ if (my @missing = grep { m|^/| && ! -e $_ } @rpms_install, @rpms_upgrade) {
interactive_msg_(N("Installation failed"),
- N("Installation failed, some files are missing.\nYou may want to update your media database.") .
+ N("Installation failed, some files are missing:\n%s\n\nYou may want to update your media database.",
+ join "\n", map { " $_" } @missing) .
(@error_msgs ? N("\n\nError(s) reported:\n%s", join("\n", @error_msgs)) : ''));
goto return_with_error;
}
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 2e678b38..9e476eee 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -8,7 +8,7 @@
%define name rpmdrake
%define version 2.1
-%define release 22mdk
+%define release 23mdk
Name: %{name}
Version: %{version}
@@ -99,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorarch}/*.pm
%changelog
+* Fri Jun 6 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-23mdk
+- rpmdrake: at install time, when some local files are impossible
+ to find, list which one (asked by Gerard Delafond <gerard at
+ delafond.org>)
+
* Fri May 30 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-22mdk
- fix media/medias by medium/media
- edit-medias: