From: Ian Jackson <ian@liberator>
Date: Thu, 12 Jul 2007 15:04:27 +0000 (+0100)
Subject: final version with locking
X-Git-Tag: converted-from-bzr~46^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=eb7dbbcb12a28aad8a36d688068d2961e3ce2940;p=autopkgtest.git

final version with locking
---

diff --git a/debian/changelog b/debian/changelog
index 3383baa..32f0d22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-autopkgtest (1.0.0~) unstable; urgency=low
+autopkgtest (1.0.0) gutsy; urgency=low
 
   * Locking: <play>.lock (unlinkable fcntl style) plus <play>/good
     sentinel file.  This will avoid conflicts between simultaneous calls
@@ -6,9 +6,9 @@ autopkgtest (1.0.0~) unstable; urgency=low
     target is enhanced so that the caller can take out the lock and hold
     it will starting and discarding the testbed more than once.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 12 Jul 2007 15:01:35 +0100
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 12 Jul 2007 15:01:35 +0100
 
-autopkgtest (0.9.2~) unstable; urgency=low
+autopkgtest (0.9.2) unreleased; urgency=low
 
   * Really discard stderr from our ought-to-be-unnecessary
     modprobe dm-snapshot.
diff --git a/xen/userv-target b/xen/userv-target
index c6a80c5..f0a7ff7 100755
--- a/xen/userv-target
+++ b/xen/userv-target
@@ -43,7 +43,7 @@ case "$1" in
 pon0)	run adt-xenlvm-on-testbed -- --print0-command ;;
 console) xm console "$nd" ;;
 with)
-	ADT_LOCKED="$nddir/lock" with-lock-ex -w "$nddir/lock" sh -ec '
+	ADT_LOCKED="$nddir.lock" with-lock-ex -w "$nddir.lock" sh -ec '
 		while adt-xenlvm-with-testbed \
 			--adt-distro="$1" --adt-nominum="$2" \
 		      sh -c "echo y && read again" && \