From 862312654914e00519c3d974cc8830c2872c04b4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 28 Mar 2008 12:07:07 +0000
Subject: - urpmq:   o do not use rpms on removable cdrom media (#39396)

---
 NEWS  | 2 ++
 urpmq | 4 ++--
 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 {
-- 
cgit v1.2.1