diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-05-18 18:27:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-05-18 18:37:45 +0200 |
| commit | 311a146daf7c2c4419139bc4161c851896fa5519 (patch) | |
| tree | 75e6bedd486e475019e3620a618127c4bbf6e1b2 | |
| parent | cbeee992e86c32056e44a440c843fbae78020b4c (diff) | |
| download | NetworkManager-311a146daf7c2c4419139bc4161c851896fa5519.tar.gz | |
contrib/makerepo: limit number of patches to revert
On rhel-6 branch, an old patch breaks the script.
Just limit the number of undos to exclude that script.
| -rwxr-xr-x | contrib/fedora/utils/makerepo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fedora/utils/makerepo.sh b/contrib/fedora/utils/makerepo.sh index 4401aff1b6..1ed407fa27 100755 --- a/contrib/fedora/utils/makerepo.sh +++ b/contrib/fedora/utils/makerepo.sh @@ -387,7 +387,7 @@ EOF IFS=$'\n' read -rd '' -a PATCH_LIST <<<"$(sed -n 's/^Patch\([0-9]\+\): \+\(.*\)$/\1 \2/p' ../"$SPEC" | sort -n)" if [[ "$BUILD_TYPE" == "NetworkManager" ]]; then - if containsElement idx "69 rh558983-bridging.patch" "${PATCH_LIST[@]}"; then + if containsElement idx "123 rh1085015-applet-translations.patch" "${PATCH_LIST[@]}"; then # for rhel-6, NetworkManager contains some patches that break the script. In this # case, truncate the list of what we would normally revert. PATCH_LIST=("${PATCH_LIST[@]:$((idx+1))}") |