Fix CWD when running 'git pull', fix parameters.

When refreshing a reporitory clone, running 'git pull $dir' does
not do the trick - it assumes the CWD is the clone, and imports
data from repository at $dir. So we need to set CWD properly and
do just 'git pull'.

Also, prefix class members with 'self'.

diff --git a/client/utils/git.py b/client/utils/git.py
index dcd74afa2e23495b5d046c94db528c3cdbbb6a25..11b00c1e82385308b9f669c707bce5aaa16b030a 100644 (file)
--- a/client/utils/git.py
+++ b/client/utils/git.py
@@ -26,10 +26,10 @@ class GitRepository(object):
 
        def _clone(self):
                ''
-               log("cloning repository '%s' to '%s'" % (url, path))
+               log("cloning repository '%s' to '%s'" % (self._url, self._path))
 
                with TemporaryFile() as strout:
-                       call(['git', 'clone', url, path], stdout=strout, stderr=STDOUT)
+                       call(['git', 'clone', self._url, self._path], stdout=strout, stderr=STDOUT)
 
 
        def _update(self):
@@ -40,7 +40,7 @@ class GitRepository(object):
                # simply call git-pull and redirect stdout/stderr
                # FIXME should verify that the repository uses the proper upstream url
                with TemporaryFile() as strout:
-                       call(['git', 'pull', self._path], stdout=strout, stderr=STDOUT)
+                       call(['git', 'pull'], cwd=self._path, stdout=strout, stderr=STDOUT)
 
 
        def current_commit(self):