jenkins-bot has submitted this change and it was merged. Change subject: Revert "Put tar and diff files in the right place." ......................................................................
Revert "Put tar and diff files in the right place." Break the script when doing: ./make-release.py 1.21.2 It ends up with the base path being duplicated for the tar ball and hence can't find anymore. This reverts commit dac0b1ab71f8b07544116f9346e2e88936a73eaa. Change-Id: Ifb3f0a84123160b6ff104ccf4885bf4d52388e8b --- M make-release/make-release.py 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/make-release/make-release.py b/make-release/make-release.py index 70cfb85..afc2d43 100755 --- a/make-release/make-release.py +++ b/make-release/make-release.py @@ -387,7 +387,7 @@ print "Done" return diffStatus == 1 - def makeTarFile(self, package, targetDir, tarFileDir, argAdd=[]): + def makeTarFile(self, package, targetDir, dir, argAdd=[]): tar = self.options.tar_command tarignore = self.options.destDir + '/tarignore' @@ -397,8 +397,8 @@ # Generate the .tar.gz file filename = package + '.tar.gz' - outFile = open(tarFileDir + '/' + filename, "w") - args = [tar, '--format=gnu', '--exclude-vcs', '-C', tarFileDir] + outFile = open(dir + '/' + filename, "w") + args = [tar, '--format=gnu', '--exclude-vcs', '-C', dir] if tarignore: args += ['--exclude-from', tarignore] args += argAdd @@ -459,19 +459,18 @@ # Generate the .tar.gz files outFiles = [] - resultDir = buildDir + '/' + dir outFiles.append( self.makeTarFile( package='mediawiki-core-' + version, - targetDir=buildDir + '/' + package, - tarFileDir=resultDir, + targetDir=package, + dir=buildDir, argAdd=extExclude) ) outFiles.append( self.makeTarFile( package=package, - targetDir=buildDir + '/' + package, - tarFileDir=resultDir) + targetDir=package, + dir=buildDir) ) # Patch @@ -483,14 +482,14 @@ self.exportExtension(branch, ext, prevDir) self.makePatch( - resultDir, package + '.patch.gz', prevDir, package, 'normal') + buildDir, package + '.patch.gz', prevDir, package, 'normal') outFiles.append(package + '.patch.gz') print package + '.patch.gz written' haveI18n = False if os.path.exists(package + '/languages/messages'): i18nPatch = 'mediawiki-i18n-' + version + '.patch.gz' if (self.makePatch( - resultDir, i18nPatch, prevDir, package, 'i18n')): + buildDir, i18nPatch, prevDir, package, 'i18n')): outFiles.append(i18nPatch) print i18nPatch + ' written' haveI18n = True @@ -501,7 +500,7 @@ if options.sign: try: proc = subprocess.Popen([ - 'gpg', '--detach-sign', resultDir + '/' + fileName]) + 'gpg', '--detach-sign', dir + '/' + fileName]) except OSError, e: print "gpg failed, does it exist? Skip with --dont-sign." print "Error %s: %s" % (e.errno, e.strerror) @@ -514,7 +513,7 @@ # Generate upload tarball tar = self.options.tar_command - args = [tar, '-C', resultDir, + args = [tar, '-C', buildDir, '-cf', uploadDir + '/upload-' + version + '.tar'] args.extend(uploadFiles) proc = subprocess.Popen(args) -- To view, visit https://gerrit.wikimedia.org/r/95780 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb3f0a84123160b6ff104ccf4885bf4d52388e8b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: MarkAHershberger <mhershber...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits