jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404050 )
Change subject: Remove pointless have_i18n variable, add some missing docstrings
......................................................................
Remove pointless have_i18n variable, add some missing docstrings
Change-Id: I347891c3323f80a6ea19f63778fa733beb62322a
---
M make-release/makerelease.py
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index 0186724..13da5c7 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -405,6 +405,7 @@
return 0
def ask(self, question):
+ """What does the user want?"""
if self.options.yes:
return True
@@ -422,12 +423,14 @@
return result
def export(self, git_ref, export_dir, patches=None):
+ """Clone core and possibly apply some patches"""
if patches:
git_ref = self.version.branch
get_git(export_dir, git_ref)
maybe_apply_patches(export_dir, patches)
def make_patch(self, dest_dir, patch_file_name, dir1, dir2, patch_type):
+ """Make a patch file, given two directories"""
patch_file = open(os.path.join(dest_dir, patch_file_name), 'w')
args = ['diff', '-Nruw']
if patch_type == 'i18n':
@@ -458,6 +461,7 @@
return diff_status == 1
def make_tar(self, package, input_dir, build_dir, add_args=None):
+ """Tar up a directory"""
tar = self.options.tar_command
# Generate the .tar.gz file
@@ -483,7 +487,7 @@
return filename
def do_release(self, version, extensions=None):
-
+ """Do all the nasty work of building a release"""
build_dir = self.options.buildroot
patch_dir = self.options.patch_dir
@@ -543,7 +547,6 @@
)
# Patch
- have_i18n = False
if not self.options.no_previous and prev_version is not None:
prev_dir = 'mediawiki-' + prev_version
prev_mw_version = MwVersion(prev_version)
@@ -562,7 +565,8 @@
build_dir, i18n_patch, prev_dir, package, 'i18n')):
out_files.append(i18n_patch)
logging.info('%s written', i18n_patch)
- have_i18n = True
+ else:
+ i18n_patch = None
# Sign
for file_name in out_files:
@@ -597,7 +601,7 @@
print()
if prev_version is not None:
- if have_i18n:
+ if i18n_patch:
print("Patch to previous version (" + prev_version +
"), without interface text:")
print(server + package + '.patch.gz')
--
To view, visit https://gerrit.wikimedia.org/r/404050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I347891c3323f80a6ea19f63778fa733beb62322a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
