jenkins-bot has submitted this change and it was merged.
Change subject: skip tarignore if it is not existing
......................................................................
skip tarignore if it is not existing
Will print a lame warning and keep proceeding nonetheless.
Change-Id: I3547f499245df1d1152a1370690ba3c1943a7943
---
M make-release/make-release.py
1 file changed, 9 insertions(+), 3 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 912dffc..c566daf 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -388,11 +388,17 @@
def makeTarFile(self, package, file, dir, argAdd=[]):
tar = self.options.tar_command
- # Generate the .tar.gz file
+ tarignore = self.options.destDir + '/tarignore'
+ if not os.path.isfile(tarignore):
+ "Tarignore %s not found, IGNORING." % tarignore
+ tarignore = None
+
+ # Generate the .tar.gz file
filename = dir + '/' + file + '.tar.gz'
outFile = open(filename, "w")
- args = [tar, '--format=gnu', '--exclude-vcs', '--exclude-from',
- self.options.destDir + '/tarignore']
+ args = [tar, '--format=gnu', '--exclude-vcs']
+ if tarignore:
+ args += ['--exclude-from', tarignore]
args += argAdd
args += ['-c', package]
--
To view, visit https://gerrit.wikimedia.org/r/86271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3547f499245df1d1152a1370690ba3c1943a7943
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
