[SVN] r2932 - in trunk/tools/dar: . dists/el2i dists/rh6i dists/rh7i dists/rh8i dists/rh9i

svn-commits at rpmforge.net svn-commits at rpmforge.net
Fri Mar 4 03:33:58 CET 2005


Author: dag
Date: 2005-03-04 03:33:57 +0100 (Fri, 04 Mar 2005)
New Revision: 2932

Modified:
   trunk/tools/dar/dar-exec
   trunk/tools/dar/dar-functions
   trunk/tools/dar/dar-shell
   trunk/tools/dar/dists/el2i/config
   trunk/tools/dar/dists/rh6i/config
   trunk/tools/dar/dists/rh7i/config
   trunk/tools/dar/dists/rh8i/config
   trunk/tools/dar/dists/rh9i/config
Log:
Fixed another problem that could cause rpmdb cache corruption. Esp. on RH9

Modified: trunk/tools/dar/dar-exec
===================================================================
--- trunk/tools/dar/dar-exec	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dar-exec	2005-03-04 02:33:57 UTC (rev 2932)
@@ -19,13 +19,14 @@
 for distname in $DISTS; do
 	echo "Executing \"$CMD\" for $distname."
 
-	if [ -r "$CONFIGDIR/dists/$dist/config" ]; then
-		source "$CONFIGDIR/dists/$dist/config"
+	if [ -r "$CONFIGDIR/dists/$distname/config" ]; then
+		source "$CONFIGDIR/dists/$distname/config"
 	fi
 
 	### Check for building as user
 	if [ $AS_ROOT -eq 1 ]; then
-		DO_SU="/bin/su - -c"
+#		DO_SU="/bin/su - -c"
+		DO_SU="/bin/bash -c"
 	else
 		DO_SU="/bin/su - -m $BUILD_USER -c"
 	fi

Modified: trunk/tools/dar/dar-functions
===================================================================
--- trunk/tools/dar/dar-functions	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dar-functions	2005-03-04 02:33:57 UTC (rev 2932)
@@ -433,7 +433,8 @@
 #	genbasedir --bloat --bz2only $FTPDIR/$DISTPATH/ $REPO
 }
 
-export LD_ASSUME_KERNEL="2.4.9"
+#export LD_ASSUME_KERNEL="2.4.9"
+export LD_ASSUME_KERNEL
 
 ### Main
 if [ -r "$DARCONFIG" ]; then

Modified: trunk/tools/dar/dar-shell
===================================================================
--- trunk/tools/dar/dar-shell	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dar-shell	2005-03-04 02:33:57 UTC (rev 2932)
@@ -20,11 +20,10 @@
 	DISTS="$DEFAULT_DISTS"
 fi
 
+echo "Entering shells."
 for distname in $DISTS; do
-	echo "Entering $distname shell."
-
-	if [ -r "$CONFIGDIR/dists/$dist/config" ]; then
-		source "$CONFIGDIR/dists/$dist/config"
+	if [ -r "$CONFIGDIR/dists/$distname/config" ]; then
+		source "$CONFIGDIR/dists/$distname/config"
 	fi
 
 	chroot $CHROOTDIR/$distname

Modified: trunk/tools/dar/dists/el2i/config
===================================================================
--- trunk/tools/dar/dists/el2i/config	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dists/el2i/config	2005-03-04 02:33:57 UTC (rev 2932)
@@ -20,4 +20,4 @@
 REPO_YUM="no"
 REPO_CREATEREPO="no"
 
-export LD_ASSUME_KERNEL=2.4.1
+export LD_ASSUME_KERNEL="2.4.1"

Modified: trunk/tools/dar/dists/rh6i/config
===================================================================
--- trunk/tools/dar/dists/rh6i/config	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dists/rh6i/config	2005-03-04 02:33:57 UTC (rev 2932)
@@ -18,4 +18,4 @@
 REPO_YUM="no"
 REPO_CREATEREPO="no"
 
-export LD_ASSUME_KERNEL=2.4.1
+export LD_ASSUME_KERNEL="2.4.1"

Modified: trunk/tools/dar/dists/rh7i/config
===================================================================
--- trunk/tools/dar/dists/rh7i/config	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dists/rh7i/config	2005-03-04 02:33:57 UTC (rev 2932)
@@ -18,4 +18,4 @@
 REPO_YUM="yes"
 REPO_CREATEREPO="no"
 
-export LD_ASSUME_KERNEL=2.4.1
+export LD_ASSUME_KERNEL="2.4.1"

Modified: trunk/tools/dar/dists/rh8i/config
===================================================================
--- trunk/tools/dar/dists/rh8i/config	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dists/rh8i/config	2005-03-04 02:33:57 UTC (rev 2932)
@@ -18,4 +18,4 @@
 REPO_YUM="yes"
 REPO_CREATEREPO="no"
 
-export -n LD_ASSUME_KERNEL
+export LD_ASSUME_KERNEL="2.4.1"

Modified: trunk/tools/dar/dists/rh9i/config
===================================================================
--- trunk/tools/dar/dists/rh9i/config	2005-03-04 01:29:20 UTC (rev 2931)
+++ trunk/tools/dar/dists/rh9i/config	2005-03-04 02:33:57 UTC (rev 2932)
@@ -18,4 +18,4 @@
 REPO_YUM="yes"
 REPO_CREATEREPO="no"
 
-export -n LD_ASSUME_KERNEL
+export LD_ASSUME_KERNEL="2.4.1"




More information about the commits mailing list