osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41296?usp=email )
Change subject: osmo-release: debian_patch_apply: handle empty dir ......................................................................
osmo-release: debian_patch_apply: handle empty dir
Don't fail with the following bogus error message if the debian/patches directory exists but is empty:
error: can't open patch '…/git/libosmocore/debian/patches/*.patch': No such file or directory
Fixes: OS#6873 Change-Id: I6656602c58fd221c8bb933890712d1392a1dfdab --- M osmo-release.sh 1 file changed, 3 insertions(+), 3 deletions(-)
Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve
diff --git a/osmo-release.sh b/osmo-release.sh index 14790da..5a9584c 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -151,10 +151,10 @@
# Make sure that patches under debian/patches/ apply: check_debian_patch_apply() { - if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then - return - fi for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do + if ! [ -e "$patch" ]; then + continue + fi git apply --check $patch if [ $? -ne 0 ]; then error "patch no longer applies! $patch"