From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 9 Apr 2008 09:49:13 +0000 (+0000)
Subject: remove initial white space in yumgroups id/name tags, set uservisible to true
X-Git-Tag: 4.2-rc2~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=06ec9de26476770c637844505c5fb45c63eab4ae;p=build.git

remove initial white space in yumgroups id/name tags, set uservisible to true
---

diff --git a/build.common b/build.common
index 72b166ca..5faf9b4c 100644
--- a/build.common
+++ b/build.common
@@ -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