jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346600 )
Change subject: Fix up "make-release: remove offline mode, it's weird"
......................................................................
Fix up "make-release: remove offline mode, it's weird"
This mostly reverts commit 1b9da53e6f33a3550175a0b54ef6a79d33337356.
Turns out I removed the live mode code, silly backwards logic
Change-Id: I53075a5ced115b34d1f01a9c2c3de759820796f7
---
M make-release/make-release.py
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index fb92838..5c70bfd 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -403,6 +403,18 @@
logging.error("Could not update local repository %s", repo)
sys.exit(1)
+ if os.path.exists(dir):
+ logging.debug("Updating %s in %s...", label, dir)
+ proc = subprocess.Popen(
+ ['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
+ else:
+ logging.info("Cloning %s into %s...", label, dir)
+ proc = subprocess.Popen(['git', 'clone', repo, dir])
+
+ if proc.wait() != 0:
+ logging.error("git clone failed, exiting")
+ sys.exit(1)
+
os.chdir(dir)
if gitRef != 'master':
--
To view, visit https://gerrit.wikimedia.org/r/346600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53075a5ced115b34d1f01a9c2c3de759820796f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
