Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352894 )
Change subject: Make-release: Drop stupid remote update code path
......................................................................
Make-release: Drop stupid remote update code path
Repos were never a local directory so we never actually
hit this code path. Wtf was I thinking?
While we're here, also keep the checkout branch for master
as well, there's no need for this check
Change-Id: Ibc7d5b737cb7033c679e4b6729c03a5662e5fa7f
---
M make-release/make-release.py
1 file changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/94/352894/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index b398bfc..f0e3aa1 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -395,16 +395,9 @@
def getGit(self, repo, dir, label, gitRef):
oldDir = os.getcwd()
- if os.path.exists(repo):
- logging.debug("Updating local %s", repo)
- proc = subprocess.Popen(['git', 'remote', 'update'],
- cwd=repo)
- if proc.wait() != 0:
- 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)
+ logging.info("Updating %s in %s...", label, dir)
proc = subprocess.Popen(
['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
else:
@@ -417,13 +410,12 @@
os.chdir(dir)
- if gitRef != 'master':
- logging.debug("Checking out %s in %s...", gitRef, dir)
- proc = subprocess.Popen(['git', 'checkout', gitRef])
+ logging.debug("Checking out %s in %s...", gitRef, dir)
+ proc = subprocess.Popen(['git', 'checkout', gitRef])
- if proc.wait() != 0:
- logging.error("git checkout failed, exiting")
- sys.exit(1)
+ if proc.wait() != 0:
+ logging.error("git checkout failed, exiting")
+ sys.exit(1)
os.chdir(oldDir)
--
To view, visit https://gerrit.wikimedia.org/r/352894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc7d5b737cb7033c679e4b6729c03a5662e5fa7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
