aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/Iurt/Urpmi.pm10
2 files changed, 9 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 8facc8f..21978ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- iurt: also use --urpmi-root for urpmi.addmedia
+
0.7.0
- iurt: support resuming a full rebuild
- ulri: improve handling of build failures
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 41186a8..8355a4b 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -209,15 +209,19 @@ sub add_media {
plog("add chroot media: $run->{chrooted_media}");
- if (!perform_command("chroot $chroot urpmi.addmedia $media",
+ my $cmd = "chroot $chroot urpmi.addmedia $media";
+ if ($run->{chrooted_urpmi}) {
+ $cmd = "urpmi-addmedia -v --urpmi-root $chroot $media";
+ }
+ perform_command($cmd,
$run, $config,
mail => $config->{admin},
timeout => 300,
freq => 1,
retry => 2,
use_iurt_root_command => 1,
- debug_mail => $run->{debug})) {
- }
+ debug_mail => $run->{debug})
+ or return;
if (!check_media_added($chroot, $regexp)) {
plog('ERROR', "ERROR iurt could not add media into the chroot");
return;