diff options
| author | Theo Buehler <tb@openbsd.org> | 2026-08-12 06:23:29 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2026-08-12 06:23:29 +0200 |
| commit | 964d95250d4e98984fcdd3c49697de703afe32cd (patch) | |
| tree | 0550c740fd6c9467198470e0e9cdbb0ef7b271e4 | |
| parent | 2aaf4dbee62926f4b3149d2fd6e2d40b2f6e1dd0 (diff) | |
| parent | 2677aab92004fd799305093381eaf181ff8b7cd2 (diff) | |
| download | portable-964d95250d4e98984fcdd3c49697de703afe32cd.tar.gz portable-964d95250d4e98984fcdd3c49697de703afe32cd.tar.bz2 portable-964d95250d4e98984fcdd3c49697de703afe32cd.zip | |
Land #1360 - reduce scope of set +e in update.sh
| -rwxr-xr-x | update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -30,6 +30,7 @@ fi | |||
| 30 | set +e | 30 | set +e |
| 31 | tag=`git describe --exact-match --tags HEAD 2>/dev/null` | 31 | tag=`git describe --exact-match --tags HEAD 2>/dev/null` |
| 32 | is_tag=$? | 32 | is_tag=$? |
| 33 | set -e | ||
| 33 | # adjust for 9 hour time delta between trees | 34 | # adjust for 9 hour time delta between trees |
| 34 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) | 35 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) |
| 35 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch` | 36 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch` |
| @@ -45,7 +46,6 @@ else | |||
| 45 | git -C openbsd checkout $openbsd_branch | 46 | git -C openbsd checkout $openbsd_branch |
| 46 | git -C openbsd pull | 47 | git -C openbsd pull |
| 47 | fi | 48 | fi |
| 48 | set -e | ||
| 49 | 49 | ||
| 50 | # setup source paths | 50 | # setup source paths |
| 51 | CWD=`pwd` | 51 | CWD=`pwd` |
