aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-06-01 15:12:42 +0000
committerThierry Vignaud <tv@mandriva.org>2009-06-01 15:12:42 +0000
commitbcf382a8ec7bad8446c5636b91f14bd0c2f61064 (patch)
treed5906acc2df226e6e0518da5caf430a2a9fdcfc9
parent478c89356f66dd86488242e877b7b6a88e7218a8 (diff)
downloadrpmdrake-bcf382a8ec7bad8446c5636b91f14bd0c2f61064.tar
rpmdrake-bcf382a8ec7bad8446c5636b91f14bd0c2f61064.tar.gz
rpmdrake-bcf382a8ec7bad8446c5636b91f14bd0c2f61064.tar.bz2
rpmdrake-bcf382a8ec7bad8446c5636b91f14bd0c2f61064.tar.xz
rpmdrake-bcf382a8ec7bad8446c5636b91f14bd0c2f61064.zip
(fast_open_urpmi_db) make 'urpmi-root' implying rpm-root so that
open_rpm_db() opens the proper chrooted db
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/open_db.pm1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 90b72910..a26a9e35 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@
priority packages)
- fix not displaying importance and reasons of updates (#51118)
(regression introduced by #50276 fix in 5.16.2)
+- make 'urpmi-root' implying rpm-root so that the proper chrooted db
+ got opened
- rpmdrake:
o update GUI package list
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index 9016b899..315d06c4 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -76,6 +76,7 @@ sub open_rpm_db {
sub fast_open_urpmi_db() {
my $urpm = urpm->new;
urpm::set_files($urpm, $::rpmdrake_options{'urpmi-root'}[0]) if $::rpmdrake_options{'urpmi-root'}[0];
+ $::rpmdrake_options{'rpm-root'}[0] ||= $::rpmdrake_options{'urpmi-root'}[0];
urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}[0]) if $::rpmdrake_options{'rpm-root'}[0];
urpm::args::set_debug($urpm) if $::rpmdrake_options{'debug'};
$urpm->get_global_options;