From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 16 Aug 2014 08:55:21 +0000 (+0200)
Subject: Be more specific about when git svn is used
X-Git-Tag: 0.3.0~90
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51c93c957682696c4d2d6af1c4b5b5602549c9ec;p=fdroidserver.git

Be more specific about when git svn is used
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 1e532da5..e65c9679 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -620,12 +620,12 @@ class vcs_gitsvn(vcs):
                 p = SilentPopen([gitsvn_cmd + " %s %s" % (remote_split[0], self.local)], shell=True)
                 if p.returncode != 0:
                     self.clone_failed = True
-                    raise VCSException("Git clone failed", p.output)
+                    raise VCSException("Git svn clone failed", p.output)
             else:
                 p = SilentPopen([gitsvn_cmd + " %s %s" % (self.remote, self.local)], shell=True)
                 if p.returncode != 0:
                     self.clone_failed = True
-                    raise VCSException("Git clone failed", p.output)
+                    raise VCSException("Git svn clone failed", p.output)
             self.checkrepo()
         else:
             self.checkrepo()
@@ -691,7 +691,7 @@ class vcs_gitsvn(vcs):
                     # Check out the git rev equivalent to the svn rev
                     p = SilentPopen(['git', 'checkout', git_rev], cwd=self.local)
                     if p.returncode != 0:
-                        raise VCSException("Git svn checkout of '%s' failed" % rev, p.output)
+                        raise VCSException("Git checkout of '%s' failed" % rev, p.output)
 
         # Get rid of any uncontrolled files left behind
         p = SilentPopen(['git', 'clean', '-dffx'], cwd=self.local)