MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/85640
Change subject: Ignore error on tar ...................................................................... Ignore error on tar Because it *always* happens on Gluster https://bugzilla.redhat.com/show_bug.cgi?id=762345 Change-Id: Ia7b57b694363216d103247ccea72a5f8e49dd27f --- M make-release/make-release.py 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/40/85640/1 diff --git a/make-release/make-release.py b/make-release/make-release.py index c577c33..8a000b6 100755 --- a/make-release/make-release.py +++ b/make-release/make-release.py @@ -389,21 +389,17 @@ def makeTarFile(package, file, dir, rootDir, scriptDir, argAdd=[]): # Generate the .tar.gz file filename = dir + '/' + file + '.tar.gz' - outFile = open(filename, "w") args = ['tar', '--format=gnu', '--exclude-vcs', '--exclude-from', scriptDir + '/tarignore'] args += argAdd - args += ['-c', package] + args += ['-czf', filename, package] print "Creating " + filename - tarProc = subprocess.Popen(args, stdout=subprocess.PIPE) - gzipProc = subprocess.Popen(['gzip', '-9'], stdin=tarProc.stdout, - stdout=outFile) + tarProc = subprocess.Popen(args, stdout=None) - if tarProc.wait() != 0 or gzipProc.wait() != 0: - print "tar/gzip failed, exiting" - sys.exit(1) - outFile.close() + if tarProc.wait() != 0: + print "Ignoring error, continuing." + targz = file + '.tar.gz' print targz + ' written' return targz -- To view, visit https://gerrit.wikimedia.org/r/85640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7b57b694363216d103247ccea72a5f8e49dd27f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: MarkAHershberger <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
