X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=69a469779964de17e5924f9fa7d92fabe631e655;hb=8e1aca4563ec49ce04c6f79de9611c8b38d5c2de;hp=6bffc4c61f34863d170b2cd72ceefa5ceddca418;hpb=6719939f372ab2089ba5fda311eac9db9be50657;p=build.git

diff --git a/build.common b/build.common
index 6bffc4c6..69a46977 100644
--- a/build.common
+++ b/build.common
@@ -18,7 +18,7 @@ export PATH=.:$PATH
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
 	distro=$(awk ' { print $1 } ' /etc/redhat-release)
-	case $distro in Red*) distro="Redhat" ; esac
+	case $distro in Scientific*) distro="SL" ; esac
     else
 	echo "build.common.pl_getDistro-unknown"
 	exit 1
@@ -30,7 +30,7 @@ function pl_getDistro() {
 # returns something like 8, 10, or 5.3
 function pl_getRelease() {
     if [ -f "/etc/redhat-release" ] ; then
-	release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Red") print $6 } ' /etc/redhat-release)
+	release=$(awk ' { if ($1=="Fedora" && $2=="Core") print $4 ; if (($1=="Fedora" && $2!="Core")||$1=="CentOS") print $3 ; if ($1=="Scientific") print $4 } ' /etc/redhat-release)
     else
 	echo "build.common.pl_getRelease-unknown"
 	exit 1
@@ -48,9 +48,6 @@ function pl_getReleaseName () {
 	[Ff]edora*)
 	    releasename=f$release
 	    ;;
-	[Re]edhat*)
-	    releasename=rhel6
-	    ;;
 	[Cc]entOS*)
 	    old_IFS="$IFS"
 	    IFS="."
@@ -58,6 +55,9 @@ function pl_getReleaseName () {
 	    IFS="$old_IFS"
 	    releasename=centos$1
 	    ;;
+	[Ss]cientific*)
+	    releasename=sl$release
+	    ;;
 	*)
 	    releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
 	    echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -330,6 +330,7 @@ cachedir=/var/cache/yum
 debuglevel=2
 logfile=/var/log/yum.log
 pkgpolicy=newest
+multilib_policy=best
 distroverpkg=redhat-release
 tolerant=1
 exactarch=1