From 787a9bd8b3183fb7469a4280555767d2cf646162 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 23 Sep 2008 15:55:32 +0000 Subject: - urpmi.addmedia, urpmi.update: o only look for "descriptions" in media_info/ --- urpm/media.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'urpm') diff --git a/urpm/media.pm b/urpm/media.pm index 34ae11d6..bb2a0682 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1250,9 +1250,7 @@ sub get_descriptions_remote { unlink "$urpm->{cachedir}/partial/descriptions"; urpm::sys::move_or_die($urpm, statedir_descriptions($urpm, $medium), "$urpm->{cachedir}/partial/descriptions"); } - my $result = urpm::download::sync_rel_one($urpm, $medium, 'media_info/descriptions', quiet => 1, preclean => 1) - || #- try older location - urpm::download::sync_rel_one($urpm, $medium, '../descriptions', quiet => 1, preclean => 1); + my $result = urpm::download::sync_rel_one($urpm, $medium, 'media_info/descriptions', quiet => 1, preclean => 1); if ($result) { urpm::sys::move_or_die($urpm, $result, statedir_descriptions($urpm, $medium)); -- cgit v1.2.1