[Secure-testing-commits] r34573 - bin

[Mike Gabriel]

Author: sunweaver
Date: 2015-05-29 07:32:01 +0000 (Fri, 29 May 2015)
New Revision: 34573

Modified:
   bin/gen-DSA
Log:
revert local changes to bin/gen-DSA that sneaked via previous commit (r34572)

Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA	2015-05-29 07:29:47 UTC (rev 34572)
+++ bin/gen-DSA	2015-05-29 07:32:01 UTC (rev 34573)
@@ -157,12 +157,8 @@
 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 @@
 
 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