aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-10-04 08:10:02 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-10-04 08:10:02 +0200
commit4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b (patch)
treeb7d40732b6af764bfba0b072dd222da9456fc888
parentadd1adb66f8068beac48cd0ceb978a38da93909d (diff)
downloadiurt-4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b.tar
iurt-4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b.tar.gz
iurt-4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b.tar.bz2
iurt-4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b.tar.xz
iurt-4817bf2e514ea11fb42e1cbdc3f0875cfcb2619b.zip
(install_packages) kill unused arg
-rwxr-xr-xiurt8
-rw-r--r--lib/Iurt/Chroot.pm1
-rw-r--r--lib/Iurt/Urpmi.pm2
3 files changed, 5 insertions, 6 deletions
diff --git a/iurt b/iurt
index 6a524d6..44c8779 100755
--- a/iurt
+++ b/iurt
@@ -667,7 +667,7 @@ if ($run{shell}) {
#$urpmi->set_command($chroot_tmp);
$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";
+ $urpmi->install_packages('chroot', $chroot_tmp, $local_spool, '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);
plog('NOTIFY', "dumping to a chrooted shell into $chroot_tmp");
@@ -776,7 +776,7 @@ retry:
# rpm do not found anymore installed packages, retrying several
# time to be sure something is really broken
- my $ok = $urpmi->install_packages($srpm, $chroot_tmp, $local_spool, \%pack_provide, 'install_deps', "[REBUILD] install of build dependencies of $srpm failed on $run{my_arch}", { maintainer => $maintainer }, "$path_srpm/$srpm");
+ my $ok = $urpmi->install_packages($srpm, $chroot_tmp, $local_spool, 'install_deps', "[REBUILD] install of build dependencies of $srpm failed on $run{my_arch}", { maintainer => $maintainer }, "$path_srpm/$srpm");
if (!$ok) {
$run{status}{$srpm} ||= 'install_deps_failure';
return $srpm;
@@ -797,7 +797,7 @@ retry:
plog('NOTIFY', "Building $srpm");
my $command = "rpmbuild --rebuild $run{with_flags} /home/$luser/rpmbuild/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');
+ $urpmi->install_packages('chroot', $chroot_tmp, $local_spool, 'configure', "[ADMIN] installation of urpmi and sudo failed in the chroot $run{my_arch}", { check => 1, maintainer => $config->{admin} }, 'urpmi', 'sudo');
add_sudoers($chroot_tmp, $luser);
$command = "rpmbuild -b$run{stop} /home/$luser/rpmbuild/SPECS/$spec";
}
@@ -852,7 +852,7 @@ retry:
# segfaulting when trying to install packages
if ($config->{check_binary_file}) {
- $urpmi->install_packages($srpm, $chroot_tmp, $local_spool, \%pack_provide, 'binary_test', "[REBUILD] binaries packages generated from $srpm do not install correctly", { maintainer => $maintainer } ,@packages) or return $srpm;
+ $urpmi->install_packages($srpm, $chroot_tmp, $local_spool, 'binary_test', "[REBUILD] binaries packages generated from $srpm do not install correctly", { maintainer => $maintainer } ,@packages) or return $srpm;
} else {
my $successfile = "$local_spool/log/$srpm/binary_test_$srpm-1.log";
open my $f, ">$successfile";
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index ea26655..0d23fe0 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -425,7 +425,6 @@ sub build_chroot {
"chroot",
$tmp_chroot,
$run->{local_spool},
- {},
'initialize',
"[ADMIN] creation of initial chroot failed on $run->{my_arch}",
{ maintainer => $config->{admin} },
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index d5d7434..8e69c23 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -385,7 +385,7 @@ sub _install_callback {
}
sub install_packages {
- my ($self, $title, $chroot_tmp, $local_spool, $pack_provide, $log, $error, $opt, @packages) = @_;
+ my ($self, $title, $chroot_tmp, $local_spool, $log, $error, $opt, @packages) = @_;
my $run = $self->{run};
my $config = $self->{config};