Fix the regex else vtest-init-vserver.sh generates following file

[build.git] / build.common

diff --git a/build.common b/build.common
index 74683c4..172cee2 100644 (file)
--- a/build.common
+++ b/build.common
@@ -11,6 +11,9 @@
 #
 # supported distros f8, f10, f12, centos5
 #
+# for locating pkgs.py
+export PATH=.:$PATH
+
 # returns 'Fedora' or 'CentOS' for now
 function pl_getDistro() {
     if [ -f "/etc/redhat-release" ] ; then
@@ -31,7 +34,8 @@ function pl_getRelease() {
        echo "build.common.pl_getRelease-unknown"
        exit 1
     fi
-    echo "$release"
+    # keep only the major number
+    echo "$release" | cut -d. -f1
     return 0
 }
 
@@ -508,7 +512,7 @@ function pl_fixdirs() {
 
 ########## .pkgs format
 # Usage: pl_parsePkgs keyword [-a arch] fcdistro pldistro pkgs-file[..s]
-# pkgs.py sohuld be found in PATH, like this file build.common
+# pkgs.py should be found in PATH, like this file build.common
 function pl_parsePkgs () {
     target_arch=$pl_DISTRO_ARCH
     keyword=$1;shift
@@ -727,6 +731,6 @@ function yumconf_exclude () {
     repo=$1; shift
     kexclude_line="$1" ; shift
     
-    sed -i -e "/baseurl=.*$/i\\
+    sed -i -e "/#baseurl=.*$/i\\
 $kexclude_line" $repo
 }