From 6eb2229a3b0cb1f2b70611e325abe4571c6e6be5 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 26 Jul 2012 09:16:41 +0100 Subject: [PATCH] Better detection of git-svn find-rev failure --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 06f1b94f..37caf6fc 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -173,7 +173,7 @@ class vcs_gitsvn(vcs): p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev], cwd=self.local, stdout=subprocess.PIPE) rev = p.communicate()[0].rstrip() - if p.returncode != 0: + if p.returncode != 0 or len(rev) == 0: raise VCSException("Failed to get git treeish from svn rev") # Check out the appropriate revision... if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: -- 2.30.2