diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-23 15:55:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-23 15:55:32 +0000 |
| commit | 787a9bd8b3183fb7469a4280555767d2cf646162 (patch) | |
| tree | eca9ec90f67fe71902ff9eb8b719ef8bdedb11a3 | |
| parent | ab25ce721b7bf62841c6d9c1ded8a762fb717784 (diff) | |
| download | urpmi-787a9bd8b3183fb7469a4280555767d2cf646162.tar urpmi-787a9bd8b3183fb7469a4280555767d2cf646162.tar.gz urpmi-787a9bd8b3183fb7469a4280555767d2cf646162.tar.bz2 urpmi-787a9bd8b3183fb7469a4280555767d2cf646162.tar.xz urpmi-787a9bd8b3183fb7469a4280555767d2cf646162.zip | |
- urpmi.addmedia, urpmi.update:
o only look for "descriptions" in media_info/
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/media.pm | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,7 @@ - use "versioned" media_info files (needed for aria2 to handle mirrors not having some media_info/*) +- urpmi.addmedia, urpmi.update: + o only look for "descriptions" in media_info/ - urpmi.addmedia: o --distrib: do not skip "debug_for=" media (debug media will be added with flag "ignore" if noauto=1) 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)); |