summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-13 16:48:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-13 16:48:53 +0000
commit12ba4482a5cae621dbcd031ce960978fd1a25c9f (patch)
tree638981e78d06652b6c888fa84b0bc5416d639610
parentabffa1cc886b76d3e7afebb5f30c2d6db4c2f40e (diff)
downloadurpmi-12ba4482a5cae621dbcd031ce960978fd1a25c9f.tar
urpmi-12ba4482a5cae621dbcd031ce960978fd1a25c9f.tar.gz
urpmi-12ba4482a5cae621dbcd031ce960978fd1a25c9f.tar.bz2
urpmi-12ba4482a5cae621dbcd031ce960978fd1a25c9f.tar.xz
urpmi-12ba4482a5cae621dbcd031ce960978fd1a25c9f.zip
cleanup
-rw-r--r--urpm.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 76619423..ec29eaac 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1444,10 +1444,13 @@ sub _update_medium_first_pass {
file_size("$urpm->{statedir}/synthesis.$medium->{hdlist}") > 32
or $medium->{modified_synthesis} = 1;
- #- if we're rebuilding all media, mark them as modified (except removable ones)
- $medium->{modified} ||= $options{all} && $medium->{url} !~ m!^removable!;
- #- don't ever update static media
- $medium->{static} and $medium->{modified} = 0;
+ if ($medium->{static}) {
+ #- don't ever update static media
+ $medium->{modified} = 0;
+ } elsif ($options{all}) {
+ #- if we're rebuilding all media, mark them as modified (except removable ones)
+ $medium->{modified} ||= $medium->{url} !~ m!^removable!;
+ }
unless ($medium->{modified}) {
#- the medium is not modified, but to compute dependencies,