[Collab-qa-commits] r1321 - in debcluster: configs configs/schroot configs/schroot/setup.d scripts/tasks

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-10-08 08:54:28 +0000 (Wed, 08 Oct 2008)
New Revision: 1321

Modified:
   debcluster/configs/approx.conf
   debcluster/configs/schroot/schroot.conf
   debcluster/configs/schroot/setup.d/00check
   debcluster/configs/schroot/setup.d/05lvm
   debcluster/configs/schroot/setup.d/10mount
   debcluster/scripts/tasks/buildpackage.rb
Log:
debcluster update

Modified: debcluster/configs/approx.conf
===================================================================
--- debcluster/configs/approx.conf	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/configs/approx.conf	2008-10-08 08:54:28 UTC (rev 1321)
@@ -19,4 +19,4 @@
 $syslog		daemon
 #$pdiffs	true
 #$verbose	true
-#$debug		true
+$debug		true

Modified: debcluster/configs/schroot/schroot.conf
===================================================================
--- debcluster/configs/schroot/schroot.conf	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/configs/schroot/schroot.conf	2008-10-08 08:54:28 UTC (rev 1321)
@@ -172,6 +172,15 @@
 personality=linux32
 root-users=user
 
+[lenny32-piuparts]
+type=file
+description=Debian sid 32 bits
+file=/dc/data/chroots/lenny32-piuparts.tgz
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
 [gutsy32-g43]
 type=file
 description=Debian sid 32 bits

Modified: debcluster/configs/schroot/setup.d/00check
===================================================================
--- debcluster/configs/schroot/setup.d/00check	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/configs/schroot/setup.d/00check	2008-10-08 08:54:28 UTC (rev 1321)
@@ -71,7 +71,7 @@
 		exit 1
 	    fi
 	    ;;
-	file)
+	file | loopback)
 	    if [ ! -f "$CHROOT_FILE" ]; then
 		echo "File '$CHROOT_FILE' does not exist"
 		exit 1

Modified: debcluster/configs/schroot/setup.d/05lvm
===================================================================
--- debcluster/configs/schroot/setup.d/05lvm	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/configs/schroot/setup.d/05lvm	2008-10-08 08:54:28 UTC (rev 1321)
@@ -44,20 +44,29 @@
 
     elif [ $1 = "setup-stop" ]; then
 
-        # The lock needs to be dropped immediately before destroying
-        # the device.  There is a small race here, but the lock can't
-        # be dropped once the device has been removed.
-	if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-	    echo "Removing device lock for $CHROOT_LVM_SNAPSHOT_DEVICE, owned by pid $PID"
-	fi
-        "$LIBEXEC_DIR/schroot-releaselock" \
-	    --device="$CHROOT_LVM_SNAPSHOT_DEVICE" \
-	    --pid=$PID || true
+	if [ -b "$CHROOT_LVM_SNAPSHOT_DEVICE" ]; then
+            # The lock needs to be dropped immediately before
+            # destroying the device.  There is a small race here, but
+            # the lock can't be dropped once the device has been
+            # removed.
+	    if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+		echo "Removing device lock for $CHROOT_LVM_SNAPSHOT_DEVICE, owned by pid $PID"
+	    fi
+            "$LIBEXEC_DIR/schroot-releaselock" \
+		--device="$CHROOT_LVM_SNAPSHOT_DEVICE" \
+		--pid=$PID || true
 
-	if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-	    lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
+	    if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+		lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" || true
+	    else
+		lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
+	    fi
 	else
-	    lvremove $VERBOSE -f "$CHROOT_LVM_SNAPSHOT_DEVICE" > /dev/null || true
+	    # The block device no longer exists, or was never created,
+	    # for example on lvcreate failure.
+	    if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+		echo "W: $CHROOT_LVM_SNAPSHOT_DEVICE does not exist"
+	    fi
 	fi
 
     fi

Modified: debcluster/configs/schroot/setup.d/10mount
===================================================================
--- debcluster/configs/schroot/setup.d/10mount	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/configs/schroot/setup.d/10mount	2008-10-08 08:54:28 UTC (rev 1321)
@@ -70,7 +70,7 @@
 #  FSCK_VERBOSE="-V"
 fi
 
-if [ "$CHROOT_TYPE" = "plain" ] || [ "$CHROOT_TYPE" = "directory" ] || [ "$CHROOT_TYPE" = "file" ] || [ "$CHROOT_TYPE" = "block-device" ] || [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
+if [ "$CHROOT_TYPE" = "plain" ] || [ "$CHROOT_TYPE" = "directory" ] || [ "$CHROOT_TYPE" = "file" ] || [ "$CHROOT_TYPE" = "loopback" ] || [ "$CHROOT_TYPE" = "block-device" ] || [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
 
     if [ "$CHROOT_TYPE" = "plain" ]; then
 	CHROOT_MOUNT_OPTIONS="--rbind"
@@ -78,8 +78,9 @@
     elif [ "$CHROOT_TYPE" = "directory" ]; then
 	CHROOT_MOUNT_OPTIONS="--bind"
 	CHROOT_MOUNT_DEVICE="$CHROOT_LOCATION"
+    elif [ "$CHROOT_TYPE" = "loopback" ]; then
+	CHROOT_MOUNT_OPTIONS="$CHROOT_MOUNT_OPTIONS -o loop"
     elif [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
-	CHROOT_MOUNT_OPTIONS=""
 	CHROOT_MOUNT_DEVICE="$CHROOT_LVM_SNAPSHOT_DEVICE"
     fi
 

Modified: debcluster/scripts/tasks/buildpackage.rb
===================================================================
--- debcluster/scripts/tasks/buildpackage.rb	2008-10-08 08:53:06 UTC (rev 1320)
+++ debcluster/scripts/tasks/buildpackage.rb	2008-10-08 08:54:28 UTC (rev 1321)
@@ -109,9 +109,9 @@
   puts "DC-Lintian-End."
 else
   puts "DC-Build-Status: Failed #{realtime}s"
-#  puts "### Content of /var/log/daemon.log ###"
-#  system('cat /var/log/daemon.log')
-#  puts "### End of content of /var/log/daemon.log ###"
+  puts "### Content of /var/log/daemon.log ###"
+  system('grep approx /var/log/daemon.log')
+  puts "### End of content of /var/log/daemon.log ###"
 end
 if time != 0 and realtime != 0
   m = [ realtime, time ].min.to_f