[bigtop] branch master updated: BIGTOP-3482. Fix toolchain not to break cmake by creating unnecessary symlink. (#719)

[iw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new fd4af86  BIGTOP-3482. Fix toolchain not to break cmake by creating unnecessary symlink. (#719)
fd4af86 is described below

commit fd4af860d476ccaff6f5c7202f2b25ffea1860ab
Author: Kengo Seki <se...@apache.org>
AuthorDate: Fri Jan 29 10:46:06 2021 +0900

    BIGTOP-3482. Fix toolchain not to break cmake by creating unnecessary symlink. (#719)
---
 bigtop_toolchain/manifests/packages.pp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index c42c549..b0bbb59 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -260,16 +260,18 @@ class bigtop_toolchain::packages {
     command => "/usr/bin/pip3 freeze --all; /usr/bin/pip3 --version; /usr/bin/pip3 install -q flake8 wheel",
   }
 
-  if ($operatingsystem == 'Fedora' and versioncmp($operatingsystemmajrelease, '31') >= 0) or
-     ($osfamily == 'RedHat' and $operatingsystem != 'Fedora' and versioncmp($operatingsystemmajrelease, '8') >= 0) {
-    file { '/usr/bin/python':
-      ensure => 'link',
-      target => '/usr/bin/python2',
-    }
-  } else {
-    file { '/usr/bin/cmake':
-      ensure => 'link',
-      target => '/usr/bin/cmake3',
+  if $osfamily == 'RedHat' {
+    if ($operatingsystem == 'Fedora' and versioncmp($operatingsystemmajrelease, '31') >= 0) or
+       ($operatingsystem != 'Fedora' and versioncmp($operatingsystemmajrelease, '8' ) >= 0) {
+      file { '/usr/bin/python':
+        ensure => 'link',
+        target => '/usr/bin/python2',
+      }
+    } else {
+      file { '/usr/bin/cmake':
+        ensure => 'link',
+        target => '/usr/bin/cmake3',
+      }
     }
   }
 }