File 0001-Fall-back-to-custom-vendor-if-os_vendor-fa... of Package opa-fm.4371

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch of Package opa-fm.4371

From 148e32f93aee5a52e29dff0650f5c6beb89f81a8 Mon Sep 17 00:00:00 2001
From: Nirmoy Das <ndas@suse.de>
Date: Thu, 25 Feb 2016 18:08:13 +0100
Subject: [PATCH 14/14] Fall back to 'custom' vendor if os_vendor fails

---
 MakeTools/funcs-ext.sh | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/MakeTools/funcs-ext.sh b/MakeTools/funcs-ext.sh
index 57b74fb..f87edcb 100755
--- a/MakeTools/funcs-ext.sh
+++ b/MakeTools/funcs-ext.sh
@@ -828,27 +828,32 @@ function os_vendor()
         rval=apple
     else
         filelist=`'ls' /etc/*-release | egrep -v lsb | egrep -v os`
-        rval=""
-        for file in $filelist
-        do
-	    if [ -f $file ]
-	    then
-		    rval=`basename $file -release`
-		    if [ $rval = 'SuSE' ]
-		    then
-			    if [ -f /etc/UnitedLinux-release ]
-			    then
-				    rval=UnitedLinux
-			    fi
-			elif [ $rval = 'centos' ]
-			then
-				rval=redhat
-			elif [ $rval != 'os' ]
-			then
-				break
-		    fi
-	    fi
-        done
+        if [ $? == 1 ]
+        then
+            rval="custom"
+        else
+            rval=""
+            for file in $filelist
+            do
+                if [ -f $file ]
+                then
+                    rval=`basename $file -release`
+                    if [ $rval = 'SuSE' ]
+                    then
+                        if [ -f /etc/UnitedLinux-release ]
+                        then
+                            rval=UnitedLinux
+                        fi
+                    elif [ $rval = 'centos' ]
+                    then
+                        rval=redhat
+                    elif [ $rval != 'os' ]
+                    then
+                        break
+                    fi
+                fi
+            done
+        fi
     fi
     echo $rval
 }
-- 
2.6.2

Places

File 0001-Fall-back-to-custom-vendor-if-os_vendor-fails.patch of Package opa-fm.4371

Places