[Mageia-sysadm] [151] simplify

[root at mageia.org]

Revision: 151
Author:   blino
Date:     2010-11-26 00:32:57 +0100 (Fri, 26 Nov 2010)
Log Message:
-----------
simplify

Modified Paths:
--------------
    build_system/iurt/trunk/lib/Iurt/Chroot.pm

Modified: build_system/iurt/trunk/lib/Iurt/Chroot.pm
===================================================================
--- build_system/iurt/trunk/lib/Iurt/Chroot.pm	2010-11-25 23:27:06 UTC (rev 150)
+++ build_system/iurt/trunk/lib/Iurt/Chroot.pm	2010-11-25 23:32:57 UTC (rev 151)
@@ -425,7 +425,6 @@
     plog('NOTIFY', "creating chroot");
     plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}}));
 
-    if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) {
 	mkdir_p($tmp_chroot);
 	if (!-f $chroot_tar) {
 	    plog("rebuild chroot tarball");
@@ -437,6 +436,8 @@
 		return;
 	    }
 	} else {
+	    link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n";
+
 	    plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot");
 	    sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa");
 
@@ -473,9 +474,6 @@
 	    }
 	}
 	link $tmp_tar, $chroot_tar;
-    } else {
-	die "FATAL: could not initialize chroot ($!)\n";
-    }
 
     if (!-d $chroot || $rebuild) {
 	plog('DEBUG', "recreate chroot $chroot");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101126/99f7a2a6/attachment.html>