Fixed issue when running on *nix. Refactoring

2 files changed, 22 insertions, 17 deletions

diff --git a/gitautodeploy/httpserver.py b/gitautodeploy/httpserver.py
index 96ba5cf..8032556 100644
--- a/gitautodeploy/httpserver.py
+++ b/gitautodeploy/httpserver.py
@@ -268,9 +268,10 @@ class WebhookRequestHandler(BaseHTTPRequestHandler):
                     res = GitWrapper.deploy(repo_config)
                     repo_result['deploy'] = res
 
-            except Exception as e:
-                logger.error('Error during \'pull\' or \'deploy\' operation on path: %s' % repo_config['path'])
-                logger.error(e)
+            #except Exception as e:
+            #    logger.error('Error during \'pull\' or \'deploy\' operation on path: %s' % repo_config['path'])
+            #    logger.error(e)
+            #    raise e
 
             finally:
 
diff --git a/gitautodeploy/wrappers/git.py b/gitautodeploy/wrappers/git.py
index 78a469c..3f29341 100644
--- a/gitautodeploy/wrappers/git.py
+++ b/gitautodeploy/wrappers/git.py
@@ -11,6 +11,7 @@ class GitWrapper():
         import logging
         from process import ProcessWrapper
         import os
+        import platform
 
         logger = logging.getLogger()
         logger.info("Updating repository %s" % repo_config['path'])
@@ -20,23 +21,26 @@ class GitWrapper():
             logger.info('No local repository path configured, no pull will occure')
             return 0
 
-        import platform
+        commands = []
 
         if platform.system().lower() == "windows":
             # This assumes Git for Windows is installed.
-            cmd =  ['"\Program Files\Git\usr\\bin\\bash.exe"',
-                    ' -c "cd ' + repo_config['path'],
-                    ' && unset GIT_DIR ']
-        else:
-            cmd =  ['unset GIT_DIR ']
-
-        cmd.append(' && git fetch ' + repo_config['remote'])
-        cmd.append(' && git reset --hard ' + repo_config['remote'] + '/' + repo_config['branch'])
-        cmd.append(' && git submodule init ')
-        cmd.append(' && git submodule update')
-
-        # '&& git update-index --refresh ' +\
-        res = ProcessWrapper().call([cmd], cwd=repo_config['path'], shell=True)
+            commands.append('"\Program Files\Git\usr\\bin\\bash.exe" -c "cd ' + repo_config['path'])
+
+        commands.append('unset GIT_DIR')
+        commands.append('git fetch ' + repo_config['remote'])
+        commands.append('git reset --hard ' + repo_config['remote'] + '/' + repo_config['branch'])
+        commands.append('git submodule init')
+        commands.append('git submodule update')
+        #commands.append('git update-index --refresh')
+
+        # All commands needs to success
+        for command in commands:
+            res = ProcessWrapper().call(command, cwd=repo_config['path'], shell=True)
+
+            if res != 0:
+                logger.error("Command '%s' failed with exit code %s" % (command, res))
+                break
 
         if res == 0 and os.path.isdir(repo_config['path']):
             logger.info("Repository %s successfully updated" % repo_config['path'])