lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/37475?usp=email )
Change subject: obs/lib/srcpkg: also rstrip() the output of git-version-gen
......................................................................
obs/lib/srcpkg: also rstrip() the output of git-version-gen
Ensures there is no trailing newline or space at the end of the version.
Change-Id: Ieab16b9f497a264ee025e4da362005630e83c1bb
---
M scripts/obs/lib/srcpkg.py
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/37475/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index e24f25e..9dcb33f 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -31,7 +31,7 @@
# Run git-version-gen if it is in the repository
script_path = f"{repo_path}/git-version-gen"
if os.path.exists(script_path):
- ret = lib.run_cmd([script_path, "."], cwd=repo_path).output
+ ret = lib.run_cmd([script_path, "."], cwd=repo_path).output.rstrip()
if not ret:
lib.exit_error_cmd(ret, "empty output from git-version-gen")
return ret
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37475?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ieab16b9f497a264ee025e4da362005630e83c1bb
Gerrit-Change-Number: 37475
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <[email protected]>
Gerrit-MessageType: newchange
