aboutsummaryrefslogtreecommitdiffstats
path: root/iurt2
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-24 15:37:36 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-24 15:37:36 +0000
commit7b3ed72840ce704ea352ab991c719b19fa6e9b79 (patch)
tree0d95b7e3ab11a43ab9abe58bc3237cbdfa166b9b /iurt2
parentaa05e6f780994947d980429b02854c9928d4757d (diff)
downloadiurt-7b3ed72840ce704ea352ab991c719b19fa6e9b79.tar
iurt-7b3ed72840ce704ea352ab991c719b19fa6e9b79.tar.gz
iurt-7b3ed72840ce704ea352ab991c719b19fa6e9b79.tar.bz2
iurt-7b3ed72840ce704ea352ab991c719b19fa6e9b79.tar.xz
iurt-7b3ed72840ce704ea352ab991c719b19fa6e9b79.zip
(add_sudoers) kill unused arg
Diffstat (limited to 'iurt2')
-rwxr-xr-xiurt26
1 files changed, 3 insertions, 3 deletions
diff --git a/iurt2 b/iurt2
index 127f3e0..f974008 100755
--- a/iurt2
+++ b/iurt2
@@ -745,7 +745,7 @@ if ($run{shell}) {
$urpmi->urpmi_command($chroot_tmp, $luser);
$urpmi->install_packages('chroot', $chroot_tmp, $local_spool, \%pack_provide, 'configure', "[ADMIN] installation of urpmi and sudo failed in the chroot $run{my_arch}", { check => 1, maintainer => $config->{admin} }, 'urpmi', 'sudo') or die "FATAL $program_name: could not add urpmi and sudo in the chroot";
- add_sudoers(\%run, $chroot_tmp, $luser);
+ add_sudoers($chroot_tmp, $luser);
if ($run{shell}) {
plog('NOTIFY', "dumping to a chrooted shell into $chroot_tmp");
exec $sudo, $config->{iurt_root_command}, '--chroot', $chroot_tmp, '/bin/su', '-', $luser, '-c', "$config->{prompt} bash";
@@ -913,7 +913,7 @@ retry:
my $command = "rpmbuild --rebuild $run{with_flags} /home/$luser/rpm/SRPMS/$srpm";
if ($run{stop}) {
$urpmi->install_packages('chroot', $chroot_tmp, $local_spool, \%pack_provide, 'configure', "[ADMIN] installation of urpmi and sudo failed in the chroot $run{my_arch}", { check => 1, maintainer => $config->{admin} }, 'urpmi', 'sudo');
- add_sudoers(\%run, $chroot_tmp, $luser);
+ add_sudoers($chroot_tmp, $luser);
$command = "rpmbuild -b$run{stop} /home/$luser/rpm/SPECS/$spec";
}
@@ -1381,7 +1381,7 @@ sub search_packages {
}
sub add_sudoers {
- my ($run, $chroot, $user) = @_;
+ my ($chroot, $user) = @_;
my $tmpfile = "/tmp/sudoers";
my $file = "$chroot/etc/sudoers";
my $f;