diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2012-04-03 22:12:04 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2012-04-03 22:12:04 +0000 |
| commit | ca45dd2c4b07c4af942b1737a9c062443207b162 (patch) | |
| tree | 0b33f0be661ffd2e95db17f7c7646eec198e6b37 | |
| parent | cdbe98895c41649cef30787b45f7661d35b7213a (diff) | |
| download | iurt-ca45dd2c4b07c4af942b1737a9c062443207b162.tar iurt-ca45dd2c4b07c4af942b1737a9c062443207b162.tar.gz iurt-ca45dd2c4b07c4af942b1737a9c062443207b162.tar.bz2 iurt-ca45dd2c4b07c4af942b1737a9c062443207b162.tar.xz iurt-ca45dd2c4b07c4af942b1737a9c062443207b162.zip | |
Removed unused option from clean_chroot
| -rw-r--r-- | lib/Iurt/Chroot.pm | 12 |
1 files 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"); |