Change in osmo-ci[master]: OBS: nightly: build: simplify changelog parameter

osmith gerrit-no-reply at lists.osmocom.org
Thu Apr 29 14:08:37 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23971 )

Change subject: OBS: nightly: build: simplify changelog parameter
......................................................................

OBS: nightly: build: simplify changelog parameter

Change-Id: I4a7f63f71d248b3796493adf6dc1be9c1b737c2e
---
M scripts/osmocom-nightly-packages.sh
1 file changed, 2 insertions(+), 6 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  osmith: Verified



diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index a51ef55..86f406e 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -114,7 +114,7 @@
 
 # Generate a source package and upload it to OBS
 # $1: package name (e.g. "libosmocore")
-# $2: update debian dir when set to "commit" (default):
+# $2: update debian dir, unless set to "no_commit":
 #     * add dependency on osmocom-$FEED package
 #     * add new version to changelog (e.g. "1.5.1.96.c96d7.202104281354")
 # $3: arguments to pass to "gbp buildpackage"
@@ -126,10 +126,6 @@
   local oscdir=$REPO/osc/$PROJ/$name
   local dependver="$OSMO_OBS_CONFLICT_PKGVER"
 
-  if [ -z "$changelog" ] ; then
-    changelog=commit
-  fi
-
   if [ -d "$oscdir" ] ; then
     # remove earlier version
     cd "$oscdir"
@@ -143,7 +139,7 @@
 
   cd "$repodir"
 
-  if [ "$changelog" = "commit" ] ; then
+  if [ "$changelog" != "no_commit" ] ; then
     # Add date to increase version even if commit did not change (OS#5135)
     VER="$(get_commit_version).$DT"
     osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver"

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4a7f63f71d248b3796493adf6dc1be9c1b737c2e
Gerrit-Change-Number: 23971
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.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/20210429/b74844d3/attachment.htm>


More information about the gerrit-log mailing list