diff options
| author | Mike Gabriel <sunweaver@debian.org> | 2015-05-29 07:32:01 +0000 |
|---|---|---|
| committer | Mike Gabriel <sunweaver@debian.org> | 2015-05-29 07:32:01 +0000 |
| commit | f3e5952f284612870aa6f70d96062d9f46293bc3 (patch) | |
| tree | 210be7fa7919dfb9abd4542a189978e5ec3b7ac4 /bin/gen-DSA | |
| parent | 1ed5b8190ebb405db57e97631fb019205b16205a (diff) | |
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
Diffstat (limited to 'bin/gen-DSA')
| -rwxr-xr-x | bin/gen-DSA | 12 |
1 files changed, 2 insertions, 10 deletions
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 |