Adapted for new git describe method in gbp
authorLingchaox Xin <lingchaox.xin@intel.com>
Mon, 1 Jul 2013 06:49:55 +0000 (14:49 +0800)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Mon, 1 Jul 2013 08:08:01 +0000 (01:08 -0700)
Change-Id: Ia7e4dbbb44dcfa0587c65f9d83d0c7ece280ecd4

job_deletetag.py

index 8537853..f8ba11c 100755 (executable)
@@ -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"""