summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-27 11:18:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-27 11:18:09 +0000
commitf89d1b8daf5f217a83c37520ea3af788297e1c78 (patch)
tree8e88c9e13dee4f532aac48c67b8fae1fdde341cc
parenta37ac4885675defbdac79ed451105fce7eacfa85 (diff)
downloadurpmi-f89d1b8daf5f217a83c37520ea3af788297e1c78.tar
urpmi-f89d1b8daf5f217a83c37520ea3af788297e1c78.tar.gz
urpmi-f89d1b8daf5f217a83c37520ea3af788297e1c78.tar.bz2
urpmi-f89d1b8daf5f217a83c37520ea3af788297e1c78.tar.xz
urpmi-f89d1b8daf5f217a83c37520ea3af788297e1c78.zip
what we really want here is the place where the synthesis is, so in the case
of {with_synthesis}, we want to check/mount there
-rw-r--r--urpm/media.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index c8397efb..66f9134f 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1237,15 +1237,15 @@ sub _is_statedir_MD5SUM_uptodate {
sub _update_medium__parse_if_unmodified__local {
my ($urpm, $medium, $options) = @_;
- my $dir = file_from_local_url($medium->{url});
+ my $dir = $options->{probe_with} ne 'rpms' && _valid_synthesis_dir($medium)
+ ? _synthesis_dir($medium) : file_from_local_url($medium->{url});
if (!-d $dir) {
#- the directory given does not exist and may be accessible
#- by mounting some other directory. Try to figure it out and mount
#- everything that might be necessary.
urpm::removable::try_mounting($urpm,
- $options->{probe_with} ne 'rpms' && _valid_synthesis_dir($medium)
- ? _synthesis_dir($medium) : $dir,
+ $dir,
#- in case of an iso image, pass its name
urpm::removable::is_iso($medium->{removable}) && $medium->{removable},
) or $urpm->{error}(N("unable to access medium \"%s\",