diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-09-12 11:40:40 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-09-12 11:40:40 +0000 |
commit | 813fe8304abeeb4072d96793ff0452c91f0afa54 (patch) | |
tree | ab6404eec9f4ddc3c1928cc10ff0ea86b5b20483 | |
parent | b60c1ac92239c795121810c85fc58f1b0238a7c2 (diff) | |
download | urpmi-813fe8304abeeb4072d96793ff0452c91f0afa54.tar urpmi-813fe8304abeeb4072d96793ff0452c91f0afa54.tar.gz urpmi-813fe8304abeeb4072d96793ff0452c91f0afa54.tar.bz2 urpmi-813fe8304abeeb4072d96793ff0452c91f0afa54.tar.xz urpmi-813fe8304abeeb4072d96793ff0452c91f0afa54.zip |
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)
-rw-r--r-- | urpm.pm | 4 | ||||
-rwxr-xr-x | urpmi | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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}) { @@ -357,7 +357,7 @@ if ($auto_update && !$bug && !$env) { quiet => $verbose < 0, ); foreach (@{$urpm->{media} || []}) { - $_->{modified} and delete $_->{ignore}; + $_->{tempignore} and delete $_->{ignore}; } } |