From 98edbcab8e1c7fc4d3bd2ed0fcb3786b6ce75a21 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 19 Nov 2007 13:34:51 +0000
Subject: - urpmi   o --auto-update is quite unsafe, but at least now it should
 be cleaner     (ensure $urpm doesn't have media twice)

bug triggered by --auto-update --update. still --auto-update --update should
not update non-update media...
---
 NEWS          | 2 ++
 urpm/media.pm | 2 +-
 urpmi         | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 0f30b95b..e11dda4e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
     so allow symlinks on the server)
   o fix "urpmi --install-src" (regression introduced in 4.10.9) (#35164)
   o fix --limit-rate (regression introduced in 4.9.12)
+  o --auto-update is quite unsafe, but at least now it should be cleaner
+    (ensure $urpm doesn't have media twice)
 
 Version 4.10.14 - 4 October 2007, by Pascal "Pixel" Rigaux
 
diff --git a/urpm/media.pm b/urpm/media.pm
index 37719335..90fbd167 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -464,7 +464,7 @@ sub write_config {
 
 sub _tempignore {
     my ($medium, $ignore) = @_;
-    $medium->{tempignore} = $medium->{ignore} = $ignore;
+    $medium->{ignore} = $ignore;
 }
 
 #- read urpmi.cfg file as well as necessary synthesis files
diff --git a/urpmi b/urpmi
index f98f8a50..307a6bcb 100755
--- a/urpmi
+++ b/urpmi
@@ -369,9 +369,10 @@ if ($auto_update && !$bug && !$env) {
 	nomd5sum => $nomd5sum,
 	forcekey => $forcekey,
     );
-    foreach (@{$urpm->{media} || []}) {
-	$_->{tempignore} and delete $_->{ignore};
-    }
+    delete $urpm->{media};
+    $urpm->{depslist} = [];
+    $urpm->{provides} = {};
+    $urpm->{obsoletes} = {};
 }
 
 urpm::media::configure($urpm, %config_hash);
-- 
cgit v1.2.1