diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-09-05 09:02:37 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-09-05 09:02:37 +0000 |
| commit | 1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d (patch) | |
| tree | f17a2ed169d0bb7b6acf4ecf722e28a5ec798d67 /urpm.pm | |
| parent | 9b3e9b763ac55efc1f9227ccaa7aa5b176c49353 (diff) | |
| download | urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.gz urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.bz2 urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.xz urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.zip | |
Is it okay => Is this okay.
Diffstat (limited to 'urpm.pm')
| -rw-r--r-- | urpm.pm | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -886,11 +886,9 @@ sub update_media { #- the directory given does not exist and may be accessible #- by mounting some other. try to figure out these directory and #- mount everything necessary. - if ($options{force} < 2 && ($options{probe_with_hdlist} || $medium->{with_hdlist})) { - $urpm->try_mounting($with_hdlist_dir) or $urpm->{log}(_("unable to access medium \"%s\"", $medium->{name})), next; - } else { - $urpm->try_mounting($dir) or $urpm->{log}(_("unable to access medium \"%s\"", $medium->{name})), next; - } + $urpm->try_mounting($options{force} < 2 && ($options{probe_with_hdlist} || $medium->{with_hdlist}) ? + $with_hdlist_dir : $dir) or + $urpm->{error}(_("unable to access medium \"%s\"", $medium->{name})), next; #- try to probe for possible with_hdlist parameter, unless #- it is already defined (and valid). |