summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 12:48:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 12:48:50 +0000
commitca1469673bdf227a09bf4b0592ed4d914632cedd (patch)
tree76cb4b35264f0b7f80a81b856fd1c6f423035cad
parent7e95082d91e12214def0d3c1cf0d0933d25c2a7b (diff)
downloadurpmi-ca1469673bdf227a09bf4b0592ed4d914632cedd.tar
urpmi-ca1469673bdf227a09bf4b0592ed4d914632cedd.tar.gz
urpmi-ca1469673bdf227a09bf4b0592ed4d914632cedd.tar.bz2
urpmi-ca1469673bdf227a09bf4b0592ed4d914632cedd.tar.xz
urpmi-ca1469673bdf227a09bf4b0592ed4d914632cedd.zip
introduce $medium->{really_modified} which is what $medium->{modified} should
be... but {modified} is over-used (eg: it often means "to update")
-rw-r--r--urpm.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 224404da..00aaeddb 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1105,6 +1105,7 @@ sub _parse_hdlist_or_synthesis__virtual {
if (my $hdlist_or = hdlist_or_synthesis_for_virtual_medium($medium)) {
delete $medium->{modified};
+ $medium->{really_modified} = 1;
$urpm->{md5sum_modified} = 1;
_parse_maybe_hdlist_or_synthesis($urpm, $medium, $hdlist_or);
_check_after_reading_hdlist_or_synthesis($urpm, $medium);
@@ -1775,6 +1776,7 @@ sub _update_medium_first_pass {
unless ($medium->{virtual}) {
#- make sure to rebuild base files and clear medium modified state.
$medium->{modified} = 0;
+ $medium->{really_modified} = 1;
$urpm->{md5sum_modified} = 1;
#- but use newly created file.
@@ -1946,10 +1948,10 @@ sub update_media {
}
_build_hdlist_synthesis($urpm, $medium);
- _get_pubkey_and_descriptions($urpm, $medium, $options{nopubkey});
-
- _read_cachedir_pubkey($urpm, $medium);
-
+ if ($medium->{really_modified}) {
+ _get_pubkey_and_descriptions($urpm, $medium, $options{nopubkey});
+ _read_cachedir_pubkey($urpm, $medium);
+ }
}
if ($urpm->{modified}) {