From a61052a8adff1707a3b8562bf287fc608c7bd709 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Wed, 5 Mar 2003 15:13:54 +0000 Subject: rpmdrake: when installation fails because some files are missing, display any encountered urpmi error --- rpmdrake | 3 ++- rpmdrake.spec | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpmdrake b/rpmdrake index e936adf4..2b7575c7 100755 --- a/rpmdrake +++ b/rpmdrake @@ -966,7 +966,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( foreach (@rpms_install, @rpms_upgrade) { m|^/| && ! -e $_ or next; interactive_msg_(N("Installation failed"), - N("Installation failed, some files are missing.\nYou may want to update your sources database.")); + N("Installation failed, some files are missing.\nYou may want to update your sources database."). + (@error_msgs ? N("\n\nError(s) reported:\n%s", join("\n", @error_msgs)) : '')); die "return 1\n"; } %{$urpm->{state}{ask_remove}} and slow_func(N("Please wait, removing packages to allow others to be upgraded..."), diff --git a/rpmdrake.spec b/rpmdrake.spec index 0f36bc7d..17aedb33 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1 -%define release 10mdk +%define release 11mdk Name: %{name} Version: %{version} @@ -116,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Wed Mar 5 2003 Guillaume Cottenceau 2.1-11mdk +- rpmdrake: when installation fails because some files are missing, + display any encountered urpmi error + * Mon Mar 3 2003 Guillaume Cottenceau 2.1-10mdk - grpmi: fix error reporting (of gpg, rpm, curl) broken in non english -- cgit v1.2.1