Rfaulk has submitted this change and it was merged.
Change subject: fix - revert logic, add general flow.
......................................................................
fix - revert logic, add general flow.
Change-Id: I07e004301cbcae25dd101cdd562adb05f36bb5b0
---
M sartoris/sartoris.py
1 file changed, 23 insertions(+), 18 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index f0dac7b..4626cd1 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -417,28 +417,33 @@
* call sync hook with the prefix (repo) and tag info
* remove lock file
"""
- # Create lock file - check if it already exists
- if self._check_lock():
- raise SartorisError(message=exit_codes[2])
- self._create_lock()
- repo_name = self.config['repo_name']
+ #TODO: do git calls in dulwich, rather than shelling out
+ if not self._check_lock():
+ raise SartorisError(message=exit_codes[30])
- # Get latest "sync" tag - sets self._tag
- self._get_latest_deploy_tag()
+ tag = self._make_tag()
- # Write .deploy file
- try:
- deploy_file = open(self.config['deploy_file'], 'w')
- deploy_file.write(json.dumps({'repo': repo_name,
- 'tag': self._tag}))
- deploy_file.close()
- except OSError:
- exit_code = 32
- log.error("{0} :: {1}".format(__name__, exit_codes[exit_code]))
- return exit_code
+ # Perform revert
+ if hasattr(args, 'tag'):
+ # revert to tag
+ pass
+ else:
+ # revert to last tag
+ pass
- self._sync(self._tag, args.force)
+# # Write .deploy file
+# try:
+# deploy_file = open(self.config['deploy_file'], 'w')
+# deploy_file.write(json.dumps({'repo': repo_name,
+# 'tag': self._tag}))
+# deploy_file.close()
+# except OSError:
+# exit_code = 32
+# log.error("{0} :: {1}".format(__name__, exit_codes[exit_code]))
+# return exit_code
+
+ self._sync(tag, args.force)
return 0
--
To view, visit https://gerrit.wikimedia.org/r/86357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07e004301cbcae25dd101cdd562adb05f36bb5b0
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
