summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-20 16:18:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-20 16:18:01 +0000
commitf30a259156680a21009fdbf135829d01ce6c4c9d (patch)
treeabc4478b9eaac88e201239ef6d8c5097c081fae6
parenta7031093f51d3427dba6b85022084185bd39a6c8 (diff)
downloadurpmi-f30a259156680a21009fdbf135829d01ce6c4c9d.tar
urpmi-f30a259156680a21009fdbf135829d01ce6c4c9d.tar.gz
urpmi-f30a259156680a21009fdbf135829d01ce6c4c9d.tar.bz2
urpmi-f30a259156680a21009fdbf135829d01ce6c4c9d.tar.xz
urpmi-f30a259156680a21009fdbf135829d01ce6c4c9d.zip
$with_hdlist_dir really is something simple, so simplify _parse_hdlist_or_synthesis__virtual()
-rw-r--r--urpm.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/urpm.pm b/urpm.pm
index cc710d14..1cb61dc5 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1100,21 +1100,21 @@ sub _update_media__when_not_modified {
}
sub _parse_hdlist_or_synthesis__virtual {
- my ($urpm, $medium, $with_hdlist_dir) = @_;
+ my ($urpm, $medium) = @_;
- if ($medium->{with_hdlist} && -e $with_hdlist_dir) {
+ if (my $hdlist_or = hdlist_or_synthesis_for_virtual_medium($medium)) {
delete $medium->{modified};
$urpm->{md5sum_modified} = 1;
if ($medium->{synthesis}) {
- if (_parse_synthesis($urpm, $medium, $with_hdlist_dir)) {
+ if (_parse_synthesis($urpm, $medium, $hdlist_or)) {
$medium->{synthesis} = 1;
- } elsif (_parse_hdlist($urpm, $medium, $with_hdlist_dir)) {
+ } elsif (_parse_hdlist($urpm, $medium, $hdlist_or)) {
delete $medium->{synthesis};
}
} else {
- if (_parse_hdlist($urpm, $medium, $with_hdlist_dir)) {
+ if (_parse_hdlist($urpm, $medium, $hdlist_or)) {
delete $medium->{synthesis};
- } elsif (_parse_synthesis($urpm, $medium, $with_hdlist_dir)) {
+ } elsif (_parse_synthesis($urpm, $medium, $hdlist_or)) {
$medium->{synthesis} = 1;
}
}
@@ -1408,7 +1408,7 @@ this could happen if you mounted manually the directory when creating the medium
if ($medium->{virtual}) {
#- syncing a virtual medium is very simple, just try to read the file in order to
#- determine its type, once a with_hdlist has been found (but is mandatory).
- _parse_hdlist_or_synthesis__virtual($urpm, $medium, $with_hdlist_dir);
+ _parse_hdlist_or_synthesis__virtual($urpm, $medium);
}
get_descriptions_local($urpm, $medium);