Change in osmo-ci[master]: OBS: rename osmo_obs_add_debian_dependency

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Mon Jan 18 10:03:57 UTC 2021


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

Change subject: OBS: rename osmo_obs_add_debian_dependency
......................................................................

OBS: rename osmo_obs_add_debian_dependency

Change name to osmo_obs_add_depend_deb. I'll add a _rpm function in a
future patch, and so we get consistent names.

Related: OS#4733
Change-Id: Icf444b86df993184c9fe4db8d3e67ab4bb06bd47
---
M scripts/common-obs.sh
M scripts/osmocom-latest-packages.sh
M scripts/osmocom-nightly-packages.sh
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index ea1c5cb..1566def 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -19,7 +19,7 @@
 # Add dependency to all (sub)packages in debian/control and commit the change.
 # $1: path to debian/control file
 # $2: name of the package to depend on
-osmo_obs_add_debian_dependency() {
+osmo_obs_add_depend_deb() {
 	# Note: adding the comma at the end should be fine. If there is a Depends: line, it is most likely not empty. It
 	# should at least have ${misc:Depends} according to lintian.
 	sed "s/^Depends: /Depends: $2, /g" -i "$1"
diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 308efbc..271824f 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -73,7 +73,7 @@
     ./git-version-gen . > .tarball-version 2>/dev/null
   fi
 
-  osmo_obs_add_debian_dependency "./debian/control" "osmocom-latest"
+  osmo_obs_add_depend_deb "./debian/control" "osmocom-latest"
 
   if [ "$project" = "open5gs" ]; then
     # we cannot control the output directory of the generated source :(
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 1d09299..4234021 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -129,7 +129,7 @@
 
   if [ "$changelog" = "commit" ] ; then
     VER=$(get_commit_version)
-    osmo_obs_add_debian_dependency "./debian/control" "osmocom-$FEED"
+    osmo_obs_add_depend_deb "./debian/control" "osmocom-$FEED"
     dch -b -v "$VER" -m "Snapshot build"
     git commit -m "$VER snapshot" debian/
   fi

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Icf444b86df993184c9fe4db8d3e67ab4bb06bd47
Gerrit-Change-Number: 22218
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/20210118/69ddd653/attachment.htm>


More information about the gerrit-log mailing list