From cd1adc73ac19424c188ac9317e939181486a918c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 2 Oct 2008 01:03:30 +0000
Subject: (upgrade) fix removing media as user

---
 Makefile  |  3 +++
 NEWS      |  1 +
 mdkapplet | 14 +++-----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 4b59eb5f..1738c2ff 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,12 @@ install: all
 	install -m644 x-mdv-exec.desktop $(DATADIR)/mimelnk/application/
 	mkdir -p $(PREFIX)/etc/security/console.apps/
 	install -m644 console.apps_urpmi.update $(PREFIX)/etc/security/console.apps/urpmi.update
+	install -m644 console.apps_urpmi.update $(PREFIX)/etc/security/console.apps/urpmi.removemedia
 	mkdir -p $(PREFIX)/etc/pam.d
 	install -m644 pam.d_urpmi.update $(PREFIX)/etc/pam.d/urpmi.update
+	install -m644 pam.d_urpmi.update $(PREFIX)/etc/pam.d/urpmi.removemedia
 	ln -sf consolehelper $(PREFIX)/usr/bin/urpmi.update
+	ln -sf consolehelper $(PREFIX)/usr/bin/urpmi.removemedia
 
 cleandist:
 	rm -rf $(PACKAGE)-$(VERSION) ../$(PACKAGE)-$(VERSION).tar.bz2
diff --git a/NEWS b/NEWS
index d25c924a..e0b22916 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - mdkapplet
   o fix backuping urpmi.cfg
+  o fix removing media as user
 
 Version 2.45 - 30 September 2008
 
diff --git a/mdkapplet b/mdkapplet
index a1604171..a276239d 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -354,18 +354,10 @@ sub upgrade() {
         logIt(sprintf("locking urpmi database failed: %s"), $err);
         return;
     }
+    undef $_urpmi_lock;
 
-    urpm::media::read_config($urpm);
-    urpm::download::set_cmdline_proxy();
-
-    my @entries = map { $_->{name} } @{$urpm->{media}};
-    my @selected = urpm::media::select_media_by_name($urpm, \@entries, 1);
-
-    if (@selected) {
-        logIt("removing all existing urpmi media for upgrade");
-        urpm::media::remove_media($urpm, \@selected);
-        urpm::media::write_urpmi_cfg($urpm);
-    }
+    logIt("removing all existing urpmi media for upgrade");
+    run_program::run('urpmi.removemedia', '-a');
 
     logIt("adding urpmi media for new distribution");
     my $product_type = lc($product_id->{type}); $product_type =~ s/\s//g;
-- 
cgit v1.2.1