From b07d044f1a66a271a919be82c36d0fd20ccb7002 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 15 Oct 2008 14:28:36 +0000
Subject: (upgrade) display error dialog instead of success one when we cannot
 add the media

---
 NEWS                     |  4 ++++
 mdkapplet-upgrade-helper | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 97a8267e..245fd5a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- mdkapplet-upgrade-helper
+  o display error dialog instead of success one when we cannot add the
+    media
+
 Version 2.60 - 14 October 2008
 
 - mdkapplet-upgrade-helper
diff --git a/mdkapplet-upgrade-helper b/mdkapplet-upgrade-helper
index 01e52f3d..37a3588d 100755
--- a/mdkapplet-upgrade-helper
+++ b/mdkapplet-upgrade-helper
@@ -123,7 +123,15 @@ sub upgrade() {
 
     if (my $err = $@) {
         log::explanations(sprintf("locking urpmi database failed: %s"), $err);
-        return;
+        ugtk2::ask_warn(N("Error"),
+                        N("Installation failed"),
+                        '',
+                        formatAlaTeX(N("Packages database is locked. Please close other applications
+working with packages database (do you have another media
+manager on another desktop, or are you currently installing
+packages as well?)."))
+                    );
+        exit(1);
     }
     undef $urpmi_lock;
 
@@ -142,7 +150,11 @@ sub upgrade() {
         log::explanations("restoringing urpmi configuration from $file");
         cp_af($file, "$root/etc/urpmi/urpmi.cfg");
         run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a', '--nocheck');
-        return;
+        ugtk2::ask_warn(N("Error"),
+                        N("Installation failed"),
+                        N("Failure when adding medium"),
+                    );
+        exit(2);
     };
 
     log::explanations("upgrading urpmi and rpmdrake");
-- 
cgit v1.2.1