MarkAHershberger has submitted this change and it was merged.
Change subject: let us override the tar command
......................................................................
let us override the tar command
Some unix (such as Mac OS X) might not provide a GNU tar command. The
new --tar-command let us override it.
On Mac one would:
brew install gnu-tar
./make-release.py --tar-command gtar
And then manage to produce a tarball.
Change-Id: I556e34382c0065678341aa86ddf278bf1f536cc1
---
M make-release/make-release.py
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index c3f7f11..5db29b6 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -157,6 +157,11 @@
'create a tarball) files are stored. (defaults to '
'/usr/local/share/make-release)'
)
+ parser.add_argument(
+ '--tar-command', dest='tar_command',
+ default='tar',
+ help='path to tar, we are expecting a GNU tar. (defaults to tar)'
+ )
return parser.parse_args()
@@ -376,11 +381,12 @@
return diffStatus == 1
def makeTarFile(self, package, file, dir, argAdd=[]):
+ tar = self.options.tar_command
# Generate the .tar.gz file
filename = dir + '/' + file + '.tar.gz'
outFile = open(filename, "w")
- args = ['tar', '--format=gnu', '--exclude-vcs', '--exclude-from',
+ args = [tar, '--format=gnu', '--exclude-vcs', '--exclude-from',
self.options.destDir + '/tarignore']
args += argAdd
args += ['-c', package]
@@ -481,7 +487,8 @@
uploadFiles.append(dir + '/' + fileName + '.sig')
# Generate upload tarball
- args = ['tar', 'cf', uploadDir + '/upload-' + version + '.tar']
+ tar = self.options.tar_command
+ args = [tar, 'cf', uploadDir + '/upload-' + version + '.tar']
args.extend(uploadFiles)
proc = subprocess.Popen(args)
if proc.wait() != 0:
--
To view, visit https://gerrit.wikimedia.org/r/86270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I556e34382c0065678341aa86ddf278bf1f536cc1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
