From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Tue, 22 Jun 2010 14:26:37 +0000 (+0200)
Subject: support older git versions and ignore svn add output
X-Git-Tag: 5.0-rc11~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9b95a39ffd5915de5c566721f08c39dc4effa6f;p=build.git

support older git versions and ignore svn add output
---

diff --git a/module-tools.py b/module-tools.py
index 7cc0f155..a901e0b2 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -194,7 +194,7 @@ class SvnRepository:
     def commit(self, logfile):
         # add all new files to the repository
         Command("svn status %s | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\\ /g' | xargs svn add" %
-                self.path, self.options).run_silent()
+                self.path, self.options).output_of()
         Command("svn commit -F %s %s" % (logfile, self.path), self.options).run_fatal()
 
     def to_branch(self, branch):
@@ -314,7 +314,8 @@ class GitRepository:
         return self.__run_in_repo(c.output_of, with_stderr=True)
 
     def commit(self, logfile):
-        self.__run_command_in_repo("git add -A", ignore_errors=True)
+        self.__run_command_in_repo("git add .", ignore_errors=True)
+        self.__run_command_in_repo("git add -u", ignore_errors=True)
         self.__run_command_in_repo("git commit -F  %s" % logfile, ignore_errors=True)
         self.__run_command_in_repo("git push")
         self.__run_command_in_repo("git push --tags")