From 813fe8304abeeb4072d96793ff0452c91f0afa54 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Tue, 12 Sep 2006 11:40:40 +0000 Subject: From urpm::configure(), we need to be able to distinguish media that are temporarily ignored and permanently ignored, so we can restore the previous situation easily (bug #22354) --- urpm.pm | 4 ++-- urpmi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/urpm.pm b/urpm.pm index a526c011..6771a7af 100644 --- a/urpm.pm +++ b/urpm.pm @@ -526,7 +526,7 @@ sub configure { $urpm->select_media(split /,/, $options{media}); foreach (grep { !$_->{modified} } @{$urpm->{media} || []}) { #- this is only a local ignore that will not be saved. - $_->{ignore} = 1; + $_->{tempignore} = $_->{ignore} = 1; } } if ($options{searchmedia}) { @@ -543,7 +543,7 @@ sub configure { $urpm->select_media(split /,/, $options{excludemedia}); foreach (grep { $_->{modified} } @{$urpm->{media} || []}) { #- this is only a local ignore that will not be saved. - $_->{ignore} = 1; + $_->{tempignore} = $_->{ignore} = 1; } } if ($options{sortmedia}) { diff --git a/urpmi b/urpmi index 643b9cb6..ce2f6095 100755 --- a/urpmi +++ b/urpmi @@ -357,7 +357,7 @@ if ($auto_update && !$bug && !$env) { quiet => $verbose < 0, ); foreach (@{$urpm->{media} || []}) { - $_->{modified} and delete $_->{ignore}; + $_->{tempignore} and delete $_->{ignore}; } } -- cgit v1.2.1