chiark / gitweb /
Be more specific about when git svn is used
authorDaniel Martí <mvdan@mvdan.cc>
Sat, 16 Aug 2014 08:55:21 +0000 (10:55 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Sat, 16 Aug 2014 08:55:21 +0000 (10:55 +0200)
fdroidserver/common.py

index 1e532da5ece808a6f62631ceb770769e7a2285f8..e65c967922eecc579de070044bc483d23b241ecf 100644 (file)
@@ -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)