summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-12 19:53:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-12 19:53:35 +0000
commite19d9995e525fe989b3a674579c063a19825a272 (patch)
tree9d035355299146eec7e840276eb33db5e2daf527 /urpm.pm
parentf14f1e0e797b3305e2e6a53a4ad14e5064076559 (diff)
downloadurpmi-e19d9995e525fe989b3a674579c063a19825a272.tar
urpmi-e19d9995e525fe989b3a674579c063a19825a272.tar.gz
urpmi-e19d9995e525fe989b3a674579c063a19825a272.tar.bz2
urpmi-e19d9995e525fe989b3a674579c063a19825a272.tar.xz
urpmi-e19d9995e525fe989b3a674579c063a19825a272.zip
- urpmi
o when using --urpmi-root, load <root>/etc/rpm/macros this allow using _install_langs in the rooted directory - fix test exclude.t: the build computer macro _install_langs don't interfere anymore - add one test to exclude.t: test wether urpmi correctly honor _install_langs
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/urpm.pm b/urpm.pm
index 6aa9920c..d4faa7a1 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -74,6 +74,11 @@ sub set_files {
dirname($h{config}),
"$urpmi_root/var/lib/rpm",
]);
+
+ if ($urpmi_root && -e "$urpmi_root/etc/rpm/macros") {
+ URPM::loadmacrosfile("$urpmi_root/etc/rpm/macros");
+ }
+
}
sub protocol_from_url {