This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 7a7617db1 BIGTOP-4105: Build fails when '-DpkgSuffix' is specified and
'(rpm|deb)_pkg_suffix' is not specified in bigtop.bom (#1268)
7a7617db1 is described below
commit 7a7617db1530638ff3289519c44cd407d07857a8
Author: Mathew Kapkiai <[email protected]>
AuthorDate: Tue May 14 09:03:11 2024 +0300
BIGTOP-4105: Build fails when '-DpkgSuffix' is specified and
'(rpm|deb)_pkg_suffix' is not specified in bigtop.bom (#1268)
(cherry picked from commit 49dcc23a1158697b20fdb1f97c14b7e25f432462)
---
packages.gradle | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages.gradle b/packages.gradle
index 6c13a6834..2901ea345 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -102,7 +102,9 @@ def isValidMavenBuildThreads(threads) {
}
def getPkgNameSuffix(component, type) {
- def originalSuffix = type.equalsIgnoreCase("deb") ?
component.deb_pkg_suffix : component.rpm_pkg_suffix
+ def originalSuffix = type.equalsIgnoreCase("deb") ?
+ component.deb_pkg_suffix ?: "" :
+ component.rpm_pkg_suffix ?: "%{nil}"
def defaultSuffix = type.equalsIgnoreCase("deb") ? "" : "%{nil}"
def pkgNameSuffix = project.hasProperty("pkgSuffix")? originalSuffix :
defaultSuffix
def gradlePkgNameSuffix = pkgNameSuffix == defaultSuffix ? "" :
pkgNameSuffix
