<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22215">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  osmith: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: conflict: move pkgver to global variable<br><br>Prepare to move the 'put in git repository' code from _deb to the main<br>function by having the pkgver available outside of the _deb function.<br><br>Change the version to 1.0.0 while at it, as it looks better than 0.0.0.<br><br>Related: OS#4733<br>Change-Id: Ic56ff12b5f2fe596d73b341e1e7750a9e202ed6b<br>---<br>M scripts/common-obs-conflict.sh<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh</span><br><span>index 57679c3..ec877a1 100644</span><br><span>--- a/scripts/common-obs-conflict.sh</span><br><span>+++ b/scripts/common-obs-conflict.sh</span><br><span>@@ -2,6 +2,8 @@</span><br><span> # Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages</span><br><span> # built from different branches by accident</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_OBS_CONFLICT_PKGVER="1.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Create the conflicting package for debian</span><br><span> #</span><br><span> # $1: name of dummy package (e.g. "osmocom-nightly")</span><br><span>@@ -20,7 +22,6 @@</span><br><span> osmo_obs_prepare_conflict_deb() {</span><br><span>  local pkgname="$1"</span><br><span>         shift</span><br><span style="color: hsl(0, 100%, 40%);">-   local pkgver="0.0.0"</span><br><span>       local oldpwd="$PWD"</span><br><span> </span><br><span>    mkdir -p "$pkgname/debian/source"</span><br><span>@@ -56,7 +57,7 @@</span><br><span> </span><br><span>  # Fill changelog</span><br><span>     cat << EOF > changelog</span><br><span style="color: hsl(0, 100%, 40%);">-${pkgname} (${pkgver}) unstable; urgency=medium</span><br><span style="color: hsl(120, 100%, 40%);">+${pkgname} (${OSMO_OBS_CONFLICT_PKGVER}) unstable; urgency=medium</span><br><span> </span><br><span>   * Dummy package, which conflicts with: $@</span><br><span> </span><br><span>@@ -81,7 +82,7 @@</span><br><span>         git init .</span><br><span>   git add -A</span><br><span>   git commit -m "auto-commit: $pkgname dummy package" || true</span><br><span style="color: hsl(0, 100%, 40%);">-   git tag -f "$pkgver"</span><br><span style="color: hsl(120, 100%, 40%);">+        git tag -f "$OSMO_OBS_CONFLICT_PKGVER"</span><br><span> </span><br><span>         cd "$oldpwd"</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22215">change 22215</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/22215"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic56ff12b5f2fe596d73b341e1e7750a9e202ed6b </div>
<div style="display:none"> Gerrit-Change-Number: 22215 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>