diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-05-29 07:38:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-05-29 07:38:26 +0000 |
| commit | 1efa18b705469e57e818cef1b0c4b4d84df1e51e (patch) | |
| tree | a91ab26e6258f8c679a9be74bf9b2bf797863eae | |
| parent | fb3f59d63c3ad71769faa517a33e6be05ab56f42 (diff) | |
| download | urpmi-1efa18b705469e57e818cef1b0c4b4d84df1e51e.tar urpmi-1efa18b705469e57e818cef1b0c4b4d84df1e51e.tar.gz urpmi-1efa18b705469e57e818cef1b0c4b4d84df1e51e.tar.bz2 urpmi-1efa18b705469e57e818cef1b0c4b4d84df1e51e.tar.xz urpmi-1efa18b705469e57e818cef1b0c4b4d84df1e51e.zip | |
- urpmi.addmedia
o [bugfix] look for media/$media_dir/media_info/pubkey instead of
media/$media_dir/pubkey
(backport from trunk)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/media.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- urpmi.addmedia + o [bugfix] look for media/$media_dir/media_info/pubkey instead of + media/$media_dir/pubkey - for rpmdrake o make translate_why_removed() safe to call (cf bug #28613) diff --git a/urpm/media.pm b/urpm/media.pm index 2c27aa32..866f4607 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1164,7 +1164,7 @@ sub _get_list_or_pubkey__local { my ($urpm, $medium, $name) = @_; my $path = _hdlist_dir($medium) . "/$name" . _hdlist_suffix($medium); - -e $path or $path = file_from_local_url($medium->{url}) . "/$name"; + -e $path or $path = file_from_local_url($medium->{url}) . "/media_info/$name"; if (-e $path) { copy_and_own($path, "$urpm->{cachedir}/partial/$name") or $urpm->{error}(N("...copying failed")), return; |