<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22220">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: osmo_obs_add_rpm_spec: refactor<br><br>Rename $spec to $spec_in and add $spec to hold the destination path, to<br>avoid constructing it multiple times below.<br><br>Related: OS#4733<br>Change-Id: I4f3d4f8a8bc83ff22983e49f6a496dc8318b53cd<br>---<br>M scripts/common-obs.sh<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index 47f3f3d..0655370 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -45,26 +45,27 @@</span><br><span>        local oscdir="$1"</span><br><span>  local repodir="$2"</span><br><span>         local name="$3"</span><br><span style="color: hsl(0, 100%, 40%);">-       local spec="$(find "$repodir" -name "$name.spec.in")"</span><br><span style="color: hsl(120, 100%, 40%);">+   local spec_in="$(find "$repodir" -name "$name.spec.in")"</span><br><span style="color: hsl(120, 100%, 40%);">+        local spec="$oscdir/$name.spec"</span><br><span>    local tarball</span><br><span>        local version</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       if [ -z "$spec" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+     if [ -z "$spec_in" ]; then</span><br><span>                 echo "WARNING: RPM spec missing: $name.spec.in"</span><br><span>            return</span><br><span>       fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  cp "$spec" "$oscdir/$name.spec"</span><br><span style="color: hsl(120, 100%, 40%);">+   cp "$spec_in" "$spec"</span><br><span> </span><br><span>        # Set version</span><br><span>        version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)"</span><br><span style="color: hsl(0, 100%, 40%);">-      sed -i "s/^Version:.*/Version:  $version/g" "$oscdir/$name.spec"</span><br><span style="color: hsl(120, 100%, 40%);">+  sed -i "s/^Version:.*/Version:  $version/g" "$spec"</span><br><span> </span><br><span>  # Set source file</span><br><span>    tarball="$(ls -1 "${name}_"*".tar."*)"</span><br><span style="color: hsl(0, 100%, 40%);">-    sed -i "s/^Source:.*/Source:  $tarball/g" "$oscdir/$name.spec"</span><br><span style="color: hsl(120, 100%, 40%);">+    sed -i "s/^Source:.*/Source:  $tarball/g" "$spec"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       osc add "$name.spec"</span><br><span style="color: hsl(120, 100%, 40%);">+        osc add "$spec"</span><br><span> }</span><br><span> </span><br><span> # Get the path to a distribution specific patch, either from osmo-ci.git or from the project repository.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22220">change 22220</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/+/22220"/><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: I4f3d4f8a8bc83ff22983e49f6a496dc8318b53cd </div>
<div style="display:none"> Gerrit-Change-Number: 22220 </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>