preilly has submitted this change and it was merged.
Change subject: fix. Popen call / ref to .deploy file / _sync call args.
......................................................................
fix. Popen call / ref to .deploy file / _sync call args.
Change-Id: I9b15aad890e95cdb690a361c63410af6f9ab0e75
---
M sartoris/sartoris.py
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
preilly: Verified; Looks good to me, approved
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index d5b45b8..af5e910 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -170,7 +170,8 @@
log.error("{0}::{1}".format(__name__, exit_codes[exit_code]))
sys.exit(exit_code)
- self.config['deploy_file'] = self.config['top_dir'] + '/.git'
+ self.config['deploy_file'] = self.config['top_dir'] + \
+ '/.git/.deploy'
try:
self.config['hook_dir'] = sc.get('deploy', 'hook-dir')
@@ -351,7 +352,8 @@
_tag = "{0}-sync-{1}".format(repo_name,
datetime.now().strftime(
self.DATE_TIME_TAG_FORMAT))
- proc = subprocess.Popen(['/usr/bin/git tag', '-a', _tag])
+ proc = subprocess.Popen(['/usr/bin/git', 'tag', '-a', _tag,
+ '-m', '"test sync"'])
proc.communicate()
if proc.returncode != 0:
@@ -367,7 +369,7 @@
exit_code = 32
log.error("{0}::{1}".format(__name__, exit_codes[exit_code]))
return exit_code
- return self._sync()
+ return self._sync(_tag, None)
def _sync(self, tag, force):
repo_name = self.config['repo_name']
--
To view, visit https://gerrit.wikimedia.org/r/64032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b15aad890e95cdb690a361c63410af6f9ab0e75
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
Gerrit-Reviewer: preilly <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
