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.orgosmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22214 ) Change subject: OBS: conflict: move _deb to separate function ...................................................................... OBS: conflict: move _deb to separate function Prepare to add the _rpm function by moving the debian code to its own function and tweaking the comment above the function. Related: OS#4733 Change-Id: Ic8d55c432c6035e7ac855cf6869d2c86ace468df --- M scripts/common-obs-conflict.sh 1 file changed, 21 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Verified diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh index a3cde36..57679c3 100644 --- a/scripts/common-obs-conflict.sh +++ b/scripts/common-obs-conflict.sh @@ -2,20 +2,22 @@ # Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages # built from different branches by accident -# Create the source for a dummy package, that conflicts with another dummy package in the current -# directory. Example of the structure that will be generated: -# osmocom-nightly -# └── debian -# ├── changelog -# ├── compat -# ├── control -# ├── copyright -# ├── rules -# └── source -# └── format +# Create the conflicting package for debian +# # $1: name of dummy package (e.g. "osmocom-nightly") # $2-*: name of conflicting packages (e.g. "osmocom-latest") -osmo_obs_prepare_conflict() { +# +# Generates the following directory structure: +# osmocom-nightly +# └── debian +# ├── changelog +# ├── compat +# ├── control +# ├── copyright +# ├── rules +# └── source +# └── format +osmo_obs_prepare_conflict_deb() { local pkgname="$1" shift local pkgver="0.0.0" @@ -83,3 +85,10 @@ cd "$oldpwd" } + +# Create conflicting packages +# $1: name of dummy package (e.g. "osmocom-nightly") +# $2-*: name of conflicting packages (e.g. "osmocom-latest") +osmo_obs_prepare_conflict() { + osmo_obs_prepare_conflict_deb "$@" +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic8d55c432c6035e7ac855cf6869d2c86ace468df Gerrit-Change-Number: 22214 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/6f546264/attachment.htm>