[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Approval for a devscripts t-p-u upload



On Fri, 2008-12-12 at 18:37 +0000, Adam D. Barratt wrote:
> I've attached a minimal debdiff against the lenny version of devscripts
> for consideration.

As has just been pointed out to me, the version number was broken, as
devscripts is native; fixed debdiff attached.

Regards,

Adam
diff -Nru devscripts-2.10.35/debian/changelog devscripts-2.10.35lenny1/debian/changelog
--- devscripts-2.10.35/debian/changelog	2008-07-26 21:57:49.000000000 +0100
+++ devscripts-2.10.35lenny1/debian/changelog	2008-12-12 19:28:18.000000000 +0000
@@ -1,3 +1,12 @@
+devscripts (2.10.35lenny1) testing; urgency=low
+
+  * debsign: Fix a mktemp call to actually generate unique filenames and
+    avoid blocking forever if the file already exists (for example
+    because a previous attempt to sign had failed during the GPG phase).
+    See Debian bug #508111.
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk>  Fri, 12 Dec 2008 18:19:35 +0000
+
 devscripts (2.10.35) unstable; urgency=low
 
   * checkbashisms: Only flag "local x y" and "local foo=bar" when --posix is
diff -Nru devscripts-2.10.35/scripts/debsign.sh devscripts-2.10.35lenny1/scripts/debsign.sh
--- devscripts-2.10.35/scripts/debsign.sh	2008-06-26 19:16:27.000000000 +0100
+++ devscripts-2.10.35lenny1/scripts/debsign.sh	2008-12-12 18:26:10.000000000 +0000
@@ -87,7 +87,7 @@
     local filename
 
     if ! [ -w "$(dirname "$1")" ]; then
-	filename=`mktemp -t "$(basename "$1").XXXXXXXXXX.$2"` || {
+	filename=`mktemp -t "$(basename "$1").$2.XXXXXXXXXX"` || {
 	    echo "$PROGNAME: Unable to create temporary file; aborting" >&2
 	    exit 1
 	}

Reply to: