chiark / gitweb /
Fix Tags UCM on newer git-svn versions
authorDaniel Martí <mvdan@mvdan.cc>
Fri, 18 Jul 2014 10:12:16 +0000 (12:12 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Fri, 18 Jul 2014 10:12:16 +0000 (12:12 +0200)
fdroidserver/common.py

index 3b1d99aac304294edb784fab4e1f8e860eeea427..2e0d258d9d287f6b5aebc827fa166434209e8583 100644 (file)
@@ -700,7 +700,10 @@ class vcs_gitsvn(vcs):
 
     def gettags(self):
         self.checkrepo()
-        return os.listdir(os.path.join(self.local, '.git/svn/refs/remotes/tags'))
+        for treeish in ['origin/', '']:
+            d = os.path.join(self.local, '.git', 'svn', 'refs', 'remotes', treeish, 'tags')
+            if os.path.isdir(d):
+                return os.listdir(d)
 
     def getref(self):
         self.checkrepo()