aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-10-14 22:41:11 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-10-14 22:41:11 +0200
commitf4aa386cde5cd682eb563463c1a52950bb0e8dc8 (patch)
treecf943359b5b5d14e01a4139f9b247df217e2a413
parent85cf2a54399e6ca5c128cc56776e76673b21f31d (diff)
downloadiurt-f4aa386cde5cd682eb563463c1a52950bb0e8dc8.tar
iurt-f4aa386cde5cd682eb563463c1a52950bb0e8dc8.tar.gz
iurt-f4aa386cde5cd682eb563463c1a52950bb0e8dc8.tar.bz2
iurt-f4aa386cde5cd682eb563463c1a52950bb0e8dc8.tar.xz
iurt-f4aa386cde5cd682eb563463c1a52950bb0e8dc8.zip
kill useless argument
-rwxr-xr-xiurt4
-rw-r--r--lib/Iurt/Chroot.pm2
-rw-r--r--lib/Iurt/Urpmi.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/iurt b/iurt
index 085f3cc..f16d22f 100755
--- a/iurt
+++ b/iurt
@@ -690,7 +690,7 @@ if ($run{shell}) {
create_temp_chroot(\%run, $config, $chroot_tmp, $chroot_ref)
or die "FATAL $program_name: could not create temporary chroot";
}
- add_local_user($chroot_tmp, \%run, $config, $luser, $run{uid}) or die "FATAL $program_name: could not add local user";
+ add_local_user($chroot_tmp, $config, $luser, $run{uid}) or die "FATAL $program_name: could not add local user";
#$urpmi->set_command($chroot_tmp);
$urpmi->urpmi_command($chroot_tmp);
@@ -777,7 +777,7 @@ retry:
#($maintainer, $cc) = ($config->{admin},'');
plog('DEBUG', "creating user $luser in chroot $chroot_tmp");
- add_local_user($chroot_tmp, \%run, $config, $luser, $run{uid}) or return $srpm;
+ add_local_user($chroot_tmp, $config, $luser, $run{uid}) or return $srpm;
my $old_srpm = $srpm;
my ($ret, $spec);
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 43a9ceb..0efc3fa 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -166,7 +166,7 @@ sub dump_rpmmacros {
}
sub add_local_user {
- my ($chroot_tmp, $run, $config, $luser, $uid) = @_;
+ my ($chroot_tmp, $config, $luser, $uid) = @_;
# change the builder user to the local user id
# FIXME it seems that unionfs does not handle well the change of the
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 67e5730..64be2ea 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -295,7 +295,7 @@ sub get_build_requires {
plog("get_build_requires");
my (undef, $chroot_tmp) = create_temp_chroot($run, $config, $run->{chroot_tmp}, $run->{chroot_tar}) or return;
- add_local_user($chroot_tmp, $run, $config, $luser, $run->{uid}) or return;
+ add_local_user($chroot_tmp, $config, $luser, $run->{uid}) or return;
my $urpm = URPM->new;
foreach my $p (@{$run->{todo}}) {