Repository: bigtop Updated Branches: refs/heads/master 9b775291f -> f816347f8
BIGTOP-2536. tarball.destination is ignored when set Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f816347f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f816347f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f816347f Branch: refs/heads/master Commit: f816347f81a02721ea09d92af5361a58b985b2d9 Parents: 9b77529 Author: Konstantin Boudnik <konstantin_boud...@epam.com> Authored: Tue Sep 20 16:43:43 2016 -0700 Committer: Konstantin Boudnik <konstantin_boud...@epam.com> Committed: Wed Sep 21 10:59:30 2016 -0700 ---------------------------------------------------------------------- bigtop.bom | 5 ++++- packages.gradle | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f816347f/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 2f923c2..a0f4940 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -52,7 +52,10 @@ // 'base' is required; [pkg := base ]; [release := 1 ] version { base = 'x.y.z'; pkg = base; release = 1 } tarball { - source = "apache-component1-${version.base}.tar.gz" // *optional* + source = "apache-component1-${version.base}.tar.gz" + // It is advised to use different destination filenames to avoid + // clashes when working with git repos and downloading the artifacts + // from the branches with the same names. destination = source } url { // *optional* http://git-wip-us.apache.org/repos/asf/bigtop/blob/f816347f/packages.gradle ---------------------------------------------------------------------- diff --git a/packages.gradle b/packages.gradle index e0e3d7b..e2ddb21 100644 --- a/packages.gradle +++ b/packages.gradle @@ -562,8 +562,8 @@ def genTasks = { target -> !config.bigtop.components[target].url.site.isEmpty() && !config.bigtop.components[target].tarball.source.isEmpty()) ? config.bigtop.components[target].url.site + '/' + config.bigtop.components[target].tarball.source : null - if (!config.bigtop.components[target].tarball.source.isEmpty()) - config.bigtop.components[target].downloaddst = DL_DIR + '/' + config.bigtop.components[target].tarball.source + if (!config.bigtop.components[target].tarball.destination.isEmpty()) + config.bigtop.components[target].downloaddst = DL_DIR + '/' + config.bigtop.components[target].tarball.destination // test that the download url will return http 200. If it does not, use the ARCHIVE url instead of the MIRROR SITE url if (!config.bigtop.components[target].url.isEmpty() && !ifExists(config.bigtop.components[target].downloadurl)) {