From 75bdfdd4a5f911a18b9fd0ec60c15a310472a9d2 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 15 Nov 2006 17:05:16 +0000 Subject: cleanup using _parse_synthesis and _parse_hdlist return value --- urpm.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'urpm.pm') diff --git a/urpm.pm b/urpm.pm index cc489598..7f4ee368 100644 --- a/urpm.pm +++ b/urpm.pm @@ -1129,17 +1129,16 @@ sub _update_media__virtual { delete $medium->{modified}; $urpm->{md5sum_modified} = 1; if ($medium->{synthesis}) { - _parse_synthesis($urpm, $medium, $with_hdlist_dir); - $medium->{synthesis} = 1; - if (!is_valid_medium($medium)) { - _parse_hdlist($urpm, $medium, $with_hdlist_dir); + if (_parse_synthesis($urpm, $medium, $with_hdlist_dir)) { + $medium->{synthesis} = 1; + $urpm->{modified} = 1; + } elsif (_parse_hdlist($urpm, $medium, $with_hdlist_dir)) { delete $medium->{synthesis}; } } else { - _parse_hdlist($urpm, $medium, $with_hdlist_dir); - delete $medium->{synthesis}; - if (!is_valid_medium($medium)) { - _parse_synthesis($urpm, $medium, $with_hdlist_dir); + if (_parse_hdlist($urpm, $medium, $with_hdlist_dir)) { + delete $medium->{synthesis}; + } elsif (_parse_synthesis($urpm, $medium, $with_hdlist_dir)) { $medium->{synthesis} = 1; } } -- cgit v1.2.1