From 4e2e33173417b3dc03aefd090be77a155f293109 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 29 Aug 2007 14:27:00 +0000 Subject: (create_var_lib_rpm) split it out of set_files() --- urpm.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/urpm.pm b/urpm.pm index 05442942..547b299e 100644 --- a/urpm.pm +++ b/urpm.pm @@ -73,18 +73,22 @@ sub set_files { ); $urpm->{$_} = $h{$_} foreach keys %h; + create_var_lib_rpm($urpm, $urpmi_root, %h); + + # policy is too use chroot environment only for --urpmi-root, not for --root: + if ($urpmi_root && -e "$urpmi_root/etc/rpm/macros") { + URPM::loadmacrosfile("$urpmi_root/etc/rpm/macros"); + } +} + +sub create_var_lib_rpm { + my ($urpm, $urpmi_root, %h) = @_; require File::Path; File::Path::mkpath([ $h{statedir}, (map { "$h{cachedir}/$_" } qw(headers partial rpms)), dirname($h{config}), "$urpmi_root/var/lib/rpm", ]); - - # policy is too use chroot environment only for --urpmi-root, not for --root: - if ($urpmi_root && -e "$urpmi_root/etc/rpm/macros") { - URPM::loadmacrosfile("$urpmi_root/etc/rpm/macros"); - } - } sub protocol_from_url { -- cgit v1.2.1