diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-08-05 00:19:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-05 00:24:40 +0200 |
| commit | 6c6a00eae54e630bdd15697dccbb005c2a372b96 (patch) | |
| tree | dbce336495c2f96f9364b421c77301a83ac8416b | |
| parent | dee5ce0a52b9e443afc56a95941ca18a4de23a02 (diff) | |
| download | NetworkManager-6c6a00eae54e630bdd15697dccbb005c2a372b96.tar.gz | |
contrib: use new "find-backports" script in "release.sh"
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 737eabdf84..b46d6cee5f 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -290,12 +290,12 @@ if [ "$ALLOW_LOCAL_BRANCHES" != 1 ]; then fi if [ $FIND_BACKPORTS = 1 ]; then - git show "$ORIGIN/automation:contrib/rh-utils/find-backports.sh" > ./.git/nm-find-backports.sh \ - && chmod +x ./.git/nm-find-backports.sh \ - || die "cannot get contrib/rh-utils/find-backports.sh" + git show "$ORIGIN/automation:contrib/rh-utils/find-backports" > ./.git/nm-find-backports \ + && chmod +x ./.git/nm-find-backports \ + || die "cannot get contrib/rh-utils/find-backports" - TMP="$(./.git/nm-find-backports.sh "$(git merge-base master HEAD)" "$CUR_BRANCH" master "${NEWER_BRANCHES[@]}")" || die "nm-find-backports failed" - test -z "$TMP" || die "nm-find-backports returned patches that need to be backported: ./.git/nm-find-backports.sh \"\$(git merge-base master HEAD)\" \"$CUR_BRANCH\" master ${NEWER_BRANCHES[@]}" + TMP="$(./.git/nm-find-backports "$CUR_BRANCH" master "${NEWER_BRANCHES[@]}" 2>/dev/null)" || die "nm-find-backports failed" + test -z "$TMP" || die "nm-find-backports returned patches that need to be backported (ignore with --no-find-backports): ./.git/nm-find-backports \"$CUR_BRANCH\" master ${NEWER_BRANCHES[@]}" fi TAGS=() |