Rfaulk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/87651


Change subject: fix - staging files in _dulwich_stage_all.
......................................................................

fix - staging files in _dulwich_stage_all.

Change-Id: I8c7e561a71e2ae849e49d24aee8efb845c84f79f
---
M sartoris/sartoris.py
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/51/87651/1

diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index 069a1e1..7f49428 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -25,7 +25,7 @@
 
 from config import log, configure, exit_codes, DEFAULT_CLIENT_HOOK, \
     DEFAULT_TARGET_HOOK
-from config_local import PKEY
+from config_local import PKEY, PROJECT_HOME
 
 
 class SartorisError(Exception):
@@ -226,8 +226,10 @@
 
         # Iterate through files, those modified will be staged
         for elem in os.walk(self.config['top_dir']):
-            if not search(r'\./\.git', elem[0]):
-                files = [elem[2] + '/' + file for file in elem[2]]
+            if not search(r'\.git', elem[0]):
+                files = [(elem[0] + '/' + file).split(PROJECT_HOME)[-1]
+                         for file in elem[2]]
+                log.info(__name__ + ' :: Staging - {0}'.format(files))
                 _repo.stage(files)
 
     def _dulwich_commit(self, author, message=DEFAULT_COMMIT_MSG):

-- 
To view, visit https://gerrit.wikimedia.org/r/87651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c7e561a71e2ae849e49d24aee8efb845c84f79f
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to