diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-18 17:50:29 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-18 17:53:15 +0100 |
| commit | 04290879b73e569632bf1904120b7b3f641430b3 (patch) | |
| tree | 59e6759a2a21b399be673f95c2721ca60a1f063c /contrib | |
| parent | 39c3eacb7d3a5f5ad13c299045216ccbaace1858 (diff) | |
| download | NetworkManager-04290879b73e569632bf1904120b7b3f641430b3.tar.gz | |
release: fix pattern in release.sh script for checking branch name
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index b91dfe541f..c07a8c2846 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -266,7 +266,7 @@ if [ "$CUR_BRANCH" = master ]; then number_is_odd "${VERSION_ARR[1]}" || die "Unexpected version number on master. Should be an odd development version" [ "$RELEASE_MODE" = devel -o "$RELEASE_MODE" = rc1 -o "$RELEASE_MODE" = major-post ] || die "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\"" else - re='^nm-[0-9][1-9]*-[0-9][1-9]*$' + re='^nm-[0-9]+-[0-9]+$' [[ "$CUR_BRANCH" =~ $re ]] || die "Unexpected current branch $CUR_BRANCH. Should be master or nm-?-??" if number_is_odd "${VERSION_ARR[1]}"; then # we are on a release candiate branch. |