From 40c36a5101645623bc4a3c6d8bfde9a23e98709b Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 22 Apr 2009 13:50:08 +0000
Subject: [PATCH] building on centos5.3

---
 build.common                                   | 12 ++++++++----
 mirroring/centos5/yum.repos.d/building.repo.in |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.common b/build.common
index 8d2e6649..5086c499 100644
--- a/build.common
+++ b/build.common
@@ -376,12 +376,14 @@ fi
     # glibc must be specified explicitly for the correct arch to be
     # chosen.
     echo "* Installing glibc"
-    yum $yum_options $exclude_arg install glibc
+    # ignore yum's return code that is basically undefined
+    yum $yum_options $exclude_arg install glibc || :
 
     # Go, baby, go
     if [ -n "$pkgs_packages" ] ; then
 	echo "* Installing optional packages" $pkgs_packages
-	yum $yum_options $exclude_arg install $pkgs_packages
+        # ignore yum's return code that is basically undefined
+	yum $yum_options $exclude_arg install $pkgs_packages || :
 	if ! rpm --root $vroot -q $pkgs_packages >/dev/null ; then
 	    echo "* Warning: Missing packages"
 	    rpm --root $vroot -q $pkgs_packages | grep "not installed"
@@ -392,7 +394,8 @@ fi
        ## call yum sequentially to get finer-grained info on dependencies
 	for grp in $pkgs_groups ; do
 	    echo "* Installing optional group $grp" 
-	    yum $yum_options $exclude_arg groupinstall "$grp"
+            # ignore yum's return code that is basically undefined
+	    yum $yum_options $exclude_arg groupinstall "$grp" || :
 	done
     fi
 
@@ -411,7 +414,8 @@ fi
 
     # Clean yum cache
     echo "* Cleaning up"
-    yum $yum_options clean all
+    # ignore yum's return code that is basically undefined
+    yum $yum_options clean all || :
 
     # Clean RPM state
     rm -f $vroot/var/lib/rpm/__db*
diff --git a/mirroring/centos5/yum.repos.d/building.repo.in b/mirroring/centos5/yum.repos.d/building.repo.in
index 79d8ac5b..f31bbbc9 100644
--- a/mirroring/centos5/yum.repos.d/building.repo.in
+++ b/mirroring/centos5/yum.repos.d/building.repo.in
@@ -1,12 +1,12 @@
 [base]
-name=CentOS 5.2 - $basearch - Base
-baseurl=@MIRRORURL@/centos/5.2/os/$basearch/
+name=CentOS 5.3 - $basearch - Base
+baseurl=@MIRRORURL@/centos/5.3/os/$basearch/
 gpgcheck=1
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 
 [updates]
-name=CentOS 5.2 - $basearch - Released Updates
-baseurl=@MIRRORURL@/centos/5.2/updates/$basearch/
+name=CentOS 5.3 - $basearch - Released Updates
+baseurl=@MIRRORURL@/centos/5.3/updates/$basearch/
 gpgcheck=1
 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5
 
-- 
2.47.0