diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:07 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:07 +0000 |
commit | 5af33573e3233cde8b3e421a322409b035f18832 (patch) | |
tree | f6493f4c72af24c3ba862c554fc87a660f8a4fc5 | |
parent | a1b3cacd7975f74a75be85e6a38e362b9ff5509e (diff) | |
download | iurt-5af33573e3233cde8b3e421a322409b035f18832.tar iurt-5af33573e3233cde8b3e421a322409b035f18832.tar.gz iurt-5af33573e3233cde8b3e421a322409b035f18832.tar.bz2 iurt-5af33573e3233cde8b3e421a322409b035f18832.tar.xz iurt-5af33573e3233cde8b3e421a322409b035f18832.zip |
(create_temp_chroot) kill unused arg
-rwxr-xr-x | iurt2 | 4 | ||||
-rw-r--r-- | lib/Iurt/Chroot.pm | 2 | ||||
-rw-r--r-- | lib/Iurt/Urpmi.pm | 3 |
3 files changed, 4 insertions, 5 deletions
@@ -736,7 +736,7 @@ if ($df->{per} >= 99) { if ($run{shell}) { if (!$run{use_old_chroot}) { - create_temp_chroot(\%run, $config, $cache, $chroot_tmp, $chroot_tar) + create_temp_chroot(\%run, $config, $chroot_tmp, $chroot_tar) 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"; @@ -835,7 +835,7 @@ retry: if (!$run{use_old_chroot}) { $chroot_tmp = create_temp_chroot(\%run, $config, - $cache, $chroot_tmp, $chroot_tar) or next; + $chroot_tmp, $chroot_tar) or next; } if (!$urpmi->urpmi_command($chroot_tmp, $luser)) { diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 98e04e0..a36b618 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -183,7 +183,7 @@ sub add_local_user { } sub create_temp_chroot { - my ($run, $config, $_cache, $chroot_tmp, $chroot_tar) = @_; + my ($run, $config, $chroot_tmp, $chroot_tar) = @_; plog("Install new chroot"); plog('DEBUG', "... in $chroot_tmp"); diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index a380bd5..cfdaacc 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -297,12 +297,11 @@ sub get_build_requires { my ($self, $luser) = @_; my $run = $self->{run}; my $config = $self->{config}; - my $cache = $run->{cache}; $run->{todo_requires} = {}; plog("get_build_requires"); - my (undef, $chroot_tmp) = create_temp_chroot($run, $config, $cache, $run->{chroot_tmp}, $run->{chroot_tar}) or return; + 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; my $urpm = new URPM; |