From 25e585763afd62d2de59e6b43c1bfd1814e28f44 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <sunweaver@debian.org>
Date: Fri, 29 May 2015 07:32:01 +0000
Subject: revert local changes to bin/gen-DSA that sneaked via previous commit
 (r34572)

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@34573 e39458fd-73e7-0310-bf30-c45bca0a0e42
---
 bin/gen-DSA | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'bin/gen-DSA')

diff --git a/bin/gen-DSA b/bin/gen-DSA
index 1bd262b80c..395a8f1a93 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -157,12 +157,8 @@ PACKAGE="$(tolower "$1")"
 shift
 
 TYPE=security
-REGRESSION_DAID=
-if printf '%s' "$1" | grep -Eq '^regression(|:[0-9]+(-[0-9]+|))$'; then
+if [ regression = "$1" ]; then
     TYPE=regression
-    if printf '%s' "$1" | grep -Eq '^regression:([0-9]+(-[0-9]+|))$'; then
-	REGRESSION_DAID=$(printf '%s' "$1" | sed -r 's/^regression:([0-9]+(-[0-9]+|))/\1/')
-    fi
     shift
 fi
 
@@ -239,11 +235,7 @@ fi
 
 if [ -z "$DAID" ]; then
     if [ "$TYPE" = regression ]; then
-	if [ -z "$REGRESSION_DAID" ]; then
-		latest_daid="$(sed -nr '/'"$IDMODE"'-[0-9]+-[0-9]+'" $PACKAGE "'/{s/^.+'"$IDMODE"'-[0]*([0-9-]+).*$/\1/;p;q}' data/$IDMODE/list)"
-	else
-		latest_daid="$REGRESSION_DAID"
-	fi
+	latest_daid="$(sed -nr '/'"$IDMODE"'-[0-9]+-[0-9]+'" $PACKAGE "'/{s/^.+'"$IDMODE"'-[0]*([0-9-]+).*$/\1/;p;q}' data/$IDMODE/list)"
 	revision=${latest_daid#*-}
 	daid=${latest_daid%-*}
     else
-- 
cgit v1.2.3