Merge lp:~adconrad/launchpad-buildd/speed-fixes into lp:launchpad-buildd

[Adam Conrad]

  * Shut up umount-chroot's verbose output, it served its purpose.
  * Yank out sbuild's dependency removal code, as we never once
    checked the return from this anyway, so it's just wasted time.
  * Stop writing to avg-space and avg-time, which we don't use.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-25 18:46:47 +0000
+++ debian/changelog	2012-03-22 10:18:20 +0000
@@ -1,3 +1,12 @@
+launchpad-buildd (113) hardy; urgency=low
+
+  * Shut up umount-chroot's verbose output, it served its purpose.
+  * Yank out sbuild's dependency removal code, as we never once
+    checked the return from this anyway, so it's just wasted time.
+  * Stop writing to avg-space and avg-time, which we don't use.
+
+ -- Adam Conrad <[e-mail]>  Thu, 22 Mar 2012 04:01:48 -0600
+
 launchpad-buildd (112) hardy; urgency=low
 
   [ Jelmer Vernooij ]

=== modified file 'sbuild'
--- sbuild	2011-11-29 06:09:01 +0000
+++ sbuild	2012-03-22 10:18:20 +0000
@@ -750,7 +750,7 @@
 
   cleanup_packages:
 	undo_specials();
-	uninstall_deps();
+	#uninstall_deps();
 	remove_srcdep_lock_file();
   cleanup_symlinks:
 	remove_files( @files_to_rm );
@@ -1446,13 +1446,13 @@
 	check_watches();
 	check_space( @space_files );
 
-	if ($conf::purge_build_directory eq "always" ||
-		($conf::purge_build_directory eq "successful" && $rv == 0)) {
-		print PLOG "Purging $dir\n";
-		system "$conf::sudo rm -rf $dir";
-	}
-	
-	print PLOG "-"x78, "\n";
+	#if ($conf::purge_build_directory eq "always" ||
+	#	($conf::purge_build_directory eq "successful" && $rv == 0)) {
+	#	print PLOG "Purging $dir\n";
+	#	system "$conf::sudo rm -rf $dir";
+	#}
+	#
+	#print PLOG "-"x78, "\n";
 	return $rv == 0 ? 1 : 0;
 }
 
@@ -3031,10 +3031,10 @@
 	
 	$pkg = basename( $pkg );
 	$t = 0 if $t < 0;
-	if ($main::pkg_status eq "successful") {
-		add_time_entry( $pkg, $t );
-		add_space_entry( $pkg, $main::this_space );
-	}
+	#if ($main::pkg_status eq "successful") {
+	#	add_time_entry( $pkg, $t );
+	#	add_space_entry( $pkg, $main::this_space );
+	#}
 	print PLOG "*"x78, "\n";
 	printf PLOG "Finished at ${date}Build needed %02d:%02d:%02d, %dk disk space\n",
 		   int($t/3600), int(($t%3600)/60), int($t%60), $main::this_space;

=== modified file 'umount-chroot'
--- umount-chroot	2011-11-09 07:50:56 +0000
+++ umount-chroot	2012-03-22 10:18:20 +0000
@@ -26,7 +26,7 @@
 # pass at umounting fails unless we reverse the list.  Leave the while
 # loop in just to handle pathological cases, too.
 COUNT=0
-while $GREP "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts; do
+while $GREP -q "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts; do
     COUNT=$(($COUNT+1))
     if [ $COUNT -ge 20 ]; then
     	echo "failed to umount $HOME/build-$BUILDID/chroot-autobuild"