[Secure-testing-commits] r28012 - bin doc

[Didier Raboud]

Author: odyx
Date: 2014-07-31 08:30:43 +0000 (Thu, 31 Jul 2014)
New Revision: 28012

Modified:
   bin/gen-DLA
   doc/DLA.template
Log:
Revert "Adapt bin/gen-DLA to let DLA's always read as DLA-####-#"

This reverts commit 43d595ff4bf909a5a1438e385426779dcc91d90b.

Modified: bin/gen-DLA
===================================================================
--- bin/gen-DLA	2014-07-31 08:19:26 UTC (rev 28011)
+++ bin/gen-DLA	2014-07-31 08:30:43 UTC (rev 28012)
@@ -222,10 +222,10 @@
 
 if [ -z "$DLAID" ]; then
     latest_dla="$(sed -nr '/DLA-[0-9]+-1/{s/^.+DLA-[0]*([0-9]+).*$/\1/;p;q}' data/DLA/list)"
-    dla=$(printf '%04d' $(($latest_dla+1)))
+    dla=$(($latest_dla+1))
     c=0
     while dla_exists "$dla-1"; do
-	dla=$(printf '%04d' $(($dla+1)))
+	dla=$(($dla+1))
 	c=$(($c+1))
 	if [ $c -eq 10 ]; then
 	    error "unable to find an unused DLA id after $c attempts" >&2

Modified: doc/DLA.template
===================================================================
--- doc/DLA.template	2014-07-31 08:19:26 UTC (rev 28011)
+++ doc/DLA.template	2014-07-31 08:30:43 UTC (rev 28012)
@@ -1,6 +1,6 @@
 From: $DEBFULLNAME <$DEBEMAIL>
 To: debian-lts-announce at lists.debian.org
-Subject: [DLA-$DLAID] $PACKAGE security update
+Subject: [DLA $DLAID] $PACKAGE security update
 
 Package        : $PACKAGE
 Version        : $squeeze_VERSION