Change in ...libosmocore[master]: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION

laforge gerrit-no-reply at lists.osmocom.org
Tue Aug 6 16:21:33 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15070 )

Change subject: osmo-release.sh: Drop whitespace after = when parsing LIBVERSION
......................................................................

osmo-release.sh: Drop whitespace after = when parsing LIBVERSION

As a result whitespace ended up in some variables and then command
"expr" was not happy about it.
It was spotted because src/coding/Makefile.am had some whitespacing.
Since it's the only one, let's drop the whitespace there too to have
similar line in all Makefile.am files.

Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb
---
M osmo-release.sh
M src/coding/Makefile.am
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/osmo-release.sh b/osmo-release.sh
index 4d4d080..4446da7 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -47,7 +47,7 @@
 	fi
 	if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then
 		echo "$LIBVERS" | while read -r line; do
-			libversion=$(echo "$line" | cut -d "=" -f 2)
+			libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]")
 			major="$(libversion_to_deb_major "$libversion")"
 			file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)"
 			if [ "z$file_matches" = "z0" ]; then
diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am
index c001c13..f47fe45 100644
--- a/src/coding/Makefile.am
+++ b/src/coding/Makefile.am
@@ -1,7 +1,7 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read Chapter 6 "Library interface versions" of the libtool
 # documentation before making any modification
-LIBVERSION = 1:1:1
+LIBVERSION=1:1:1
 
 AM_CPPFLAGS = \
 	-I"$(top_srcdir)/include" \

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15070
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I33afef5e4ef9eb36de81274533f46598ba9a0edb
Gerrit-Change-Number: 15070
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190806/c71e77f0/attachment.html>


More information about the gerrit-log mailing list