From ca45dd2c4b07c4af942b1737a9c062443207b162 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Tue, 3 Apr 2012 22:12:04 +0000 Subject: Removed unused option from clean_chroot --- lib/Iurt/Chroot.pm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 429d5ef..ca2f244 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -37,10 +37,10 @@ Return true. =cut sub clean_chroot { - my ($chroot, $chroot_tar, $run, $config, $o_only_clean, $o_only_tar) = @_; + my ($chroot, $chroot_tar, $run, $config, $o_only_clean) = @_; plog('DEBUG', "clean chroot"); - if (-d $chroot && !$o_only_tar) { + if (-d $chroot) { sudo($config, "--umount", "$chroot/proc"); sudo($config, "--umount", "$chroot/dev/pts"); if ($run->{icecream}) { @@ -66,14 +66,6 @@ sub clean_chroot { mkdir $chroot; - # various integrity checking - if ($o_only_tar - && -f "$chroot/home/builder/.rpmmacros" - && -d "$chroot/home/builder" - && -d "$chroot/proc") { - return 1; - } - sudo($config, '--untar', $chroot_tar, $chroot); if (!create_build_chroot($chroot, $chroot_tar, $run, $config)) { plog('ERROR', "Failed to create chroot"); -- cgit v1.2.1