From b916a14b9d07c7876bebfb70af5dddf8b4e86de7 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 13 Oct 2017 15:18:10 +0100 Subject: Change use_netns to allow per package setting --- iurt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'iurt') diff --git a/iurt b/iurt index 4ea53df..789da6f 100755 --- a/iurt +++ b/iurt @@ -503,7 +503,7 @@ my %config_usage = ( }, use_netns => { desc => 'Create a separate network namespace for each chroot to prevent builds from accessing the network', - default => 1 + default => { default => 1 } }, ); @@ -720,17 +720,20 @@ sub rebuild_one { retry: $urpmi->clean_urpmi_process; + $srpm =~ /(.*)-[^-]+-[^-]+\.src\.rpm$/ or return $srpm; + my $srpm_name = $1; + if (!$run{use_old_chroot}) { plog('DEBUG', 'Not reusing old chroot'); + my $use_netns = defined($config->{use_netns}{$srpm_name}) ? $config->{use_netns}{$srpm_name} : $config->{use_netns}{default}; $chroot_tmp = create_temp_chroot(\%run, $config, - $chroot_tmp, $chroot_ref) or return $srpm; + $chroot_tmp, $chroot_ref, $use_netns) or return $srpm; } if (!$urpmi->urpmi_command($chroot_tmp)) { plog('ERROR', "Creating chroot failed.\nCommand was: $chroot_tmp"); return $srpm; } - $srpm =~ /(.*)-[^-]+-[^-]+\.src\.rpm$/ or return $srpm; my ($maintainer, $cc); if (!$run{warn}) { ($maintainer) = get_maint(\%run, $srpm); -- cgit v1.2.1