diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:10 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:10 +0000 |
commit | 914965c2942201048f37b5fecadf65660024da5c (patch) | |
tree | f44777ef3f34078d0e79138dbfc1d74bd0edaa4d | |
parent | 5af33573e3233cde8b3e421a322409b035f18832 (diff) | |
download | iurt-914965c2942201048f37b5fecadf65660024da5c.tar iurt-914965c2942201048f37b5fecadf65660024da5c.tar.gz iurt-914965c2942201048f37b5fecadf65660024da5c.tar.bz2 iurt-914965c2942201048f37b5fecadf65660024da5c.tar.xz iurt-914965c2942201048f37b5fecadf65660024da5c.zip |
(urpmi_command) kill unused arg
-rwxr-xr-x | iurt2 | 4 | ||||
-rw-r--r-- | lib/Iurt/DKMS.pm | 2 | ||||
-rw-r--r-- | lib/Iurt/Urpmi.pm | 3 |
3 files changed, 4 insertions, 5 deletions
@@ -742,7 +742,7 @@ if ($run{shell}) { add_local_user($chroot_tmp, \%run, $config, $luser, $run{uid}) or die "FATAL $program_name: could not add local user"; #$urpmi->set_command($chroot_tmp); - $urpmi->urpmi_command($chroot_tmp, $luser); + $urpmi->urpmi_command($chroot_tmp); $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($chroot_tmp, $luser); @@ -838,7 +838,7 @@ retry: $chroot_tmp, $chroot_tar) or next; } - if (!$urpmi->urpmi_command($chroot_tmp, $luser)) { + if (!$urpmi->urpmi_command($chroot_tmp)) { plog('DEBUG', "Creating chroot failed.\nCommand was: $chroot_tmp"); next; } diff --git a/lib/Iurt/DKMS.pm b/lib/Iurt/DKMS.pm index 481da46..b2b82db 100644 --- a/lib/Iurt/DKMS.pm +++ b/lib/Iurt/DKMS.pm @@ -183,7 +183,7 @@ sub dkms_compile { clean_chroot($chroot_tmp, $chroot_tar, $run, $config); my %installed; # initialize urpmi command - $urpmi->urpmi_command($chroot_tmp, $luser); + $urpmi->urpmi_command($chroot_tmp); # also add macros for root add_local_user($chroot_tmp, $run, $config, $luser, $run->{uid}); diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index cfdaacc..3182c5a 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -78,11 +78,10 @@ sub add_to_local_media { } sub urpmi_command { - my ($self, $chroot_tmp, $_luser) = @_; + my ($self, $chroot_tmp) = @_; my $run = $self->{run}; my $local_media = $self->{local_media}; - #plog(3, "urpmi_command ($chroot_tmp user $luser)"); if ($run->{chrooted_urpmi}) { $self->set_command($chroot_tmp); |