X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=9cd25f2a8096e39d39d7d7875c78b37c557bc1e5;hb=9fd10762c5bcf969953911cbcda70a9c324006ca;hp=72b166ca90cca3662ce6c5c238fd4a063e445660;hpb=b561b83d334842e7d2209fc61d4ec3b80af7ee90;p=build.git

diff --git a/build.common b/build.common
index 72b166ca..9cd25f2a 100644
--- a/build.common
+++ b/build.common
@@ -57,12 +57,12 @@ function pl_getReleaseName () {
 		releasename=f$release
 	    fi ;;
 	[Cc]entOS*)
-	    if [ "$release" = "4.5" ] ; then
-	    # centos 4.5 is just centos4 + enhancements
-		releasename=centos4
-	    else
-		releasename=centos$release
-	    fi ;;
+	    old_IFS="$IFS"
+	    IFS="."
+	    set -- $release
+	    IFS="$old_IFS"
+	    releasename=centos$1
+	    ;;
 	*)
 	    releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
 	    echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -607,7 +607,8 @@ function pl_fixdirs() {
 function pl_getPkgsAttribute () {
     keyword=$1; shift
     file=$1; shift
-    grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,"
+    # remove any initial white spaces from the result
+    grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,," -e "s,^[[:space:]][[:space:]]*,,"
 }
 
 # for a given keyword like 'package' :
@@ -673,14 +674,13 @@ function pl_locateDistroFile () {
     fi
 }
 
-# experimental
 function yumgroups_from_pkgs () {
     builddir=$1; shift
     pldistro=$1; shift
     fcdistro=$1; shift
     pkgsnames=$@
 
-sedargs="-e s,@FCDISTRO@,$fcdistro,g"
+    sedargs="-e s,@FCDISTRO@,$fcdistro,g"
 
    cat <<__header
 <?xml version="1.0"?>
@@ -704,9 +704,8 @@ __header
   <group>
     <id>$(echo $groupname|tr A-Z a-z)</id>
     <name>$groupname</name>
-    <default>true</default>
     <description>$groupdesc</description>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
 __group_header
         for package in $packages; do