aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Iurt
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-03 23:29:50 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-03 23:29:50 +0000
commitf9eacfa91548bbca696c78883cb939f767a7b43a (patch)
tree1ecc48851119b4c0f4744f4b3da1602c68b0241b /lib/Iurt
parentbd1ab3f2bf46d65e716bc64db002703fc846dd0c (diff)
downloadiurt-f9eacfa91548bbca696c78883cb939f767a7b43a.tar
iurt-f9eacfa91548bbca696c78883cb939f767a7b43a.tar.gz
iurt-f9eacfa91548bbca696c78883cb939f767a7b43a.tar.bz2
iurt-f9eacfa91548bbca696c78883cb939f767a7b43a.tar.xz
iurt-f9eacfa91548bbca696c78883cb939f767a7b43a.zip
Drop check_build_chroot, its only goal is to force rebuilding tarball even if no package has changed over 7 days
Also, do not recreate chroot from Urpmi.pm
Diffstat (limited to 'lib/Iurt')
-rw-r--r--lib/Iurt/Chroot.pm15
-rw-r--r--lib/Iurt/Urpmi.pm3
2 files changed, 1 insertions, 17 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index 01cd514..32232a3 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -20,7 +20,6 @@ our @EXPORT = qw(
remove_chroot
create_chroot
create_build_chroot
- check_build_chroot
);
my $sudo = '/usr/bin/sudo';
@@ -409,18 +408,4 @@ sub build_chroot {
1;
}
-sub check_build_chroot {
- my ($chroot, $chroot_tar, $run, $config) = @_;
-
- plog('DEBUG', "checking basesystem tar");
-
- my (@stat) = stat $chroot_tar;
-
- if (time -$stat[9] > 604800) {
- plog('WARN', "chroot tarball too old, force rebuild");
- sudo($config, '--rm', '-r', $chroot, $chroot_tar);
- }
- create_build_chroot($chroot, $chroot_tar, $run, $config);
-}
-
1;
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 5b28c8d..a70febf 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -5,7 +5,7 @@ use RPM4::Header;
use File::Basename;
use File::NCopy qw(copy);
use MDV::Distribconf::Build;
-use Iurt::Chroot qw(add_local_user create_temp_chroot check_build_chroot);
+use Iurt::Chroot qw(add_local_user create_temp_chroot);
use Iurt::Process qw(perform_command clean_process sudo);
use Iurt::Config qw(dump_cache_par get_maint get_package_prefix);
use Iurt::Util qw(plog);
@@ -642,7 +642,6 @@ sub recreate_srpm {
$run, $config, $cache, %opt)) {
plog("ERROR: chrooting failed (retry $opt{retry}") if $run->{debug};
if ($opt{retry}) {
- check_build_chroot($run->{chroot_path}, $run->{chroot_tar}, $run, $config) or return;
return -1;
}
return;