Rfaulk has submitted this change and it was merged. Change subject: fix - align client default hook call. ......................................................................
fix - align client default hook call. Change-Id: Ie5eca7405a81adf104ae56781ab417f1e00191da --- M sartoris/config.py M sartoris/sartoris.py 2 files changed, 13 insertions(+), 5 deletions(-) Approvals: Rfaulk: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/sartoris/config.py b/sartoris/config.py index ef58978..afab7f9 100644 --- a/sartoris/config.py +++ b/sartoris/config.py @@ -32,6 +32,10 @@ # Native git call GIT_CALL = '/usr/bin/git' +# DEFAULT DEPLOY HOOKS +DEFAULT_CLIENT_HOOK = 'default-client-push.py' +DEFAULT_TARGET_HOOK = 'default-target-pull.py' + # Codes emitted on exit conditions exit_codes = { 1: 'Operation failed. Exiting.', diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py index db7eed8..ef45676 100755 --- a/sartoris/sartoris.py +++ b/sartoris/sartoris.py @@ -24,7 +24,8 @@ from dulwich.repo import Repo from dulwich.objects import Tag, Commit, parse_timezone -from config import log, configure, exit_codes +from config import log, configure, exit_codes, DEFAULT_CLIENT_HOOK, \ + DEFAULT_TARGET_HOOK from config_local import PKEY @@ -347,9 +348,10 @@ # log.info('{0} :: Calling default sync - ' 'pushing changes ... '.format(__name__)) - proc = subprocess.Popen(['{0}{1}default-client-push.py'.format( + proc = subprocess.Popen(['{0}{1}{2}'.format( self.config['client_path'], - self.config['hook_dir']), + self.config['hook_dir'], + DEFAULT_CLIENT_HOOK), self.config['remote'], self.config['branch']], stdout=subprocess.PIPE, @@ -369,9 +371,11 @@ '{0}@{1}'.format( self.config['user'], self.config['target']), - '{0}{1}default-client-pull.py'.format( + '{0}{1}{2}'.format( self.config['path'], - self.config['hook_dir']), + self.config['hook_dir'], + DEFAULT_TARGET_HOOK + ), self.config['remote'], self.config['branch']], stdout=subprocess.PIPE, -- To view, visit https://gerrit.wikimedia.org/r/84732 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5eca7405a81adf104ae56781ab417f1e00191da Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk <rfaulk...@wikimedia.org> Gerrit-Reviewer: Rfaulk <rfaulk...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits