[Mageia-dev] [soft-commits] [3909] Drop check_chroot

Wed Apr 4 10:01:08 CEST 2012

On 4 April 2012 01:01,  <root at mageia.org> wrote:
+> Revision 3909 Author pterjan Date 2012-04-04 01:01:59 +0200 (Wed, 04 Apr
+> 2012)
+>
+> Log Message
+>
+> Drop check_chroot
+
+A minor comment: it hasn't actually been dropped
+I think a better changelog would have been:
+
+"(check_chroot) merge it in check_build_chroot()"
+
+Also, you didn't comment the call to create_build_chroot() instead
+of to create_chroot().
+
+Not that it matters a lot since create_build_chroot() got killed a little
+later but it would make history easier to read in 6 months (which it
+is already not for previous years :-( )
+Thx for cleaning this btw
+
+> @@ -414,13 +413,6 @@
+>  sub check_build_chroot {
+>      my ($chroot, $chroot_tar, $run, $config) = @_;
+>
+> -    check_chroot($chroot, $chroot_tar, $run, $config,
+> -		{ packages => $config->{basesystem_packages} });
+> -}
+> -
+> -sub check_chroot {
+> -    my ($chroot, $chroot_tar, $run, $config, $opt) = @_;
+> -
+>      plog('DEBUG', "checking basesystem tar");
+>
+>      my (@stat) = stat $chroot_tar;
+> @@ -429,7 +421,7 @@
+>  	plog('WARN', "chroot tarball too old, force rebuild");
+>  	sudo($config, '--rm', '-r', $chroot, $chroot_tar);
+>      }
+> -    create_chroot($chroot, $chroot_tar, $run, $config, $opt);
+> +    create_build_chroot($chroot, $chroot_tar, $run, $config);
+