diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | mdkapplet | 14 |
3 files changed, 7 insertions, 11 deletions
@@ -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 @@ -1,5 +1,6 @@ - mdkapplet o fix backuping urpmi.cfg + o fix removing media as user Version 2.45 - 30 September 2008 @@ -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; |