From: Lingchaox Xin <lingchaox.xin@intel.com>
Date: Mon, 1 Jul 2013 06:49:55 +0000 (+0800)
Subject: Adapted for new git describe method in gbp
X-Git-Tag: 0.14~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26feaf8f8e64cae88009362a99319ae89bcf37c7;p=services%2Fjenkins-scripts.git

Adapted for new git describe method in gbp

Change-Id: Ia7e4dbbb44dcfa0587c65f9d83d0c7ece280ecd4
---

diff --git a/job_deletetag.py b/job_deletetag.py
index 8537853..f8ba11c 100755
--- a/job_deletetag.py
+++ b/job_deletetag.py
@@ -13,6 +13,7 @@ from common.git import Git, clone_gitproject
 from common.gerrit import Gerrit
 from common.gerritevent import get_gerrit_event
 
+from gbp.git.repository import GitRepositoryError
 
 def clone_tmp_git(tmpdir, gerrit_project):
     """Clone a temp git repo"""
@@ -29,13 +30,13 @@ def delete_tags(mygit, revision):
     """Delete all tags which belongs to the same commit"""
 
     while 1:
-        result = mygit.describe(revision, tags=True, exact_match=True)
+        try:
+            result = mygit.describe(revision, tags=True, exact_match=True)
+        except GitRepositoryError:
+            break
         if result:
             mygit.push('origin', ':refs/tags/%s' % result, '-f')
             mygit.delete_tag(result)
-        else:
-            break
-
 
 def main():
     """The main body"""