summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-28 12:07:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-28 12:07:07 +0000
commit862312654914e00519c3d974cc8830c2872c04b4 (patch)
treee7ca5e027cdbf41cbd11b6154239e580431a61ad
parentd2df112fef9c1dc52ddb802c1c51d4b157ca749a (diff)
downloadurpmi-862312654914e00519c3d974cc8830c2872c04b4.tar
urpmi-862312654914e00519c3d974cc8830c2872c04b4.tar.gz
urpmi-862312654914e00519c3d974cc8830c2872c04b4.tar.bz2
urpmi-862312654914e00519c3d974cc8830c2872c04b4.tar.xz
urpmi-862312654914e00519c3d974cc8830c2872c04b4.zip
- urpmq:
o do not use rpms on removable cdrom media (#39396)
-rw-r--r--NEWS2
-rwxr-xr-xurpmq4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 752391d4..801f59fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- urpmi:
o nice error message when hal daemon is not running and is needed (#39327)
+- urpmq:
+ o do not use rpms on removable cdrom media (#39396)
- urpmf, urpmq:
o display an error message when /etc/urpmi/proxy.cfg can't be read
- urpmi.update, urpmi.addmedia:
diff --git a/urpmq b/urpmq
index c45d5d9f..09f9d090 100755
--- a/urpmq
+++ b/urpmq
@@ -23,7 +23,7 @@
use strict;
-use urpm 'file_from_local_medium';
+use urpm;
use urpm::args;
use urpm::msg;
use urpm::sys;
@@ -364,7 +364,7 @@ if ($options{list_aliases}) {
my @l = grep { $medium->{start} <= $_ && $_ <= $medium->{end} } @selected or next;
my @pkgs = map { $urpm->{depslist}[$_] } @l or next;
- if (my $dir = file_from_local_medium($medium)) {
+ if (my $dir = urpm::file_from_local_url($medium->{url})) {
$urpm->{log}("getting information from rpms from $dir");
$local_sources->{$_->id} = "$dir/" . $_->filename foreach @pkgs;
} else {