<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8544">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Verified
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mkrelease: Ignore exception when trying to remove a branch not in list.<br><br>When running the mkrelease script, if a branch is not found in the<br>list when attempting to remove it, an exception is thrown. Since we<br>don't care if it's not in the list (we want to remove it anyways),<br>ignore the exception and continue.<br><br>Change-Id: I78901a5a1a8962245e12f973c522391959d6e84e<br>---<br>M digium_git.py<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/digium_git.py b/digium_git.py<br>index c76c953..7cd7c1e 100644<br>--- a/digium_git.py<br>+++ b/digium_git.py<br>@@ -292,7 +292,11 @@<br>         """<br> <br>         self.deleted_branches.append(branch)<br>-        self.updated_branches.remove(branch)<br>+        try:<br>+            self.updated_branches.remove(branch)<br>+        except:<br>+            LOGGER.debug("Branch '{0}' not in updated_branches. "<br>+                         "Nothing to remove".format(branch))<br>         try:<br>             LOGGER.debug("Deleting local branch '{0}'".format(branch))<br>             self.repo.delete_head(branch)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8544">change 8544</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.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.asterisk.org/8544"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: repotools </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I78901a5a1a8962245e12f973c522391959d6e84e </div>
<div style="display:none"> Gerrit-Change-Number: 8544 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>