Bug#517551: Calls git-svn which is non-existant in git 1.6

[Jonny Lamb]

Package: moap
Version: 0.2.6-2
Severity: important
Tags: patch

git 1.6 removed most of the git-* binaries from /usr/bin/, including
git-svn. moap calls git-svn, when it should be calling "git svn". I
attach a patch to fix this, and even update the tests.

-- 
Jonny Lamb, UK
jo...@debian.org

diff -Nruad -Nruad moap-0.2.6.orig/moap/test/test_vcs_git_svn.py moap-0.2.6/moap/test/test_vcs_git_svn.py
--- moap-0.2.6.orig/moap/test/test_vcs_git_svn.py	2009-02-28 15:13:58.000000000 +0000
+++ moap-0.2.6/moap/test/test_vcs_git_svn.py	2009-02-28 15:20:21.000000000 +0000
@@ -12,14 +12,15 @@
 from moap.vcs import svn, git, git_svn
 
 class GitSvnTestCase(test_vcs_svn.SVNTestCase):
-    # git-svn --version just errors about not having a git repo
-    if os.system('which git-svn > /dev/null 2>&1') != 0:
+    # git svn --version just errors about not having a git repo
+    # TODO: this might break on non-Debian machines.
+    if not os.path.isfile('/usr/lib/git-core/git-svn'):
         skip = "No 'git-svn' binary, skipping test."
 
     def setUp(self):
         self.repository = self.createRepository()
         self.livedir = self.createLive()
-        cmd = 'git-svn init file://%s %s' % (self.repository, self.livedir)
+        cmd = 'git svn init file://%s %s' % (self.repository, self.livedir)
         (status, output) = commands.getstatusoutput(cmd)
         self.failIf(status)
 
diff -Nruad -Nruad moap-0.2.6.orig/moap/vcs/git_svn.py moap-0.2.6/moap/vcs/git_svn.py
--- moap-0.2.6.orig/moap/vcs/git_svn.py	2009-02-28 15:13:59.000000000 +0000
+++ moap-0.2.6/moap/vcs/git_svn.py	2009-02-28 15:17:21.000000000 +0000
@@ -36,7 +36,7 @@
         oldPath = os.getcwd()
         os.chdir(self.path)
 
-        status, output = commands.getstatusoutput("git-svn fetch")
+        status, output = commands.getstatusoutput("git svn fetch")
         if status != 0:
             raise vcs.VCSException(output)
 
@@ -44,7 +44,7 @@
         if status != 0:
             raise vcs.VCSException(output)
 
-        status, output = commands.getstatusoutput("git-svn show-ignore >> .git/info/exclude")
+        status, output = commands.getstatusoutput("git svn show-ignore >> .git/info/exclude")
         if status != 0:
             raise vcs.VCSException(output)
 

signature.asc
Description: Digital signature