[svn] r5192 - trunk/tools/dar

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-02-22 16:11:30 +0100 (Thu, 22 Feb 2007)
New Revision: 5192

Modified:
   trunk/tools/dar/dar-build
   trunk/tools/dar/dar-functions
Log:
Better handling of nodist packages.

Modified: trunk/tools/dar/dar-build
===================================================================
--- trunk/tools/dar/dar-build	2007-02-22 14:11:11 UTC (rev 5191)
+++ trunk/tools/dar/dar-build	2007-02-22 15:11:30 UTC (rev 5192)
@@ -109,7 +109,7 @@
 		fi
 
 		for exclude_dist in $EXCLUDE_DIST; do
-			if [ "$exclude_dist" == "$DISTNAME" -o "$exclude_dist" == "$DISTNICK" ]; then
+			if [ "$exclude_dist" == "$DISTNAME" -o "$exclude_dist" == "$DISTNICK" -o "$DISTNAME" == "nodist" ]; then
 				warning "Distribution $DISTNAME/$DISTARCH is excluded for package $app. Aborting."
 				continue 2
 			fi
@@ -118,7 +118,7 @@
 		if [ "$EXCLUSIVE_DIST" ]; then
 			EXCLUSIVE=0
 			for exclusive_dist in $EXCLUSIVE_DIST; do
-				if [ "$exclusive_dist" == "$DISTNAME" -o "$exclusive_dist" == "$DISTNICK" ]; then
+				if [ "$exclusive_dist" == "$DISTNAME" -o "$exclusive_dist" == "$DISTNICK" -o "$DISTNAME" == "nodist" ]; then
 					EXCLUSIVE=1
 				fi
 			done

Modified: trunk/tools/dar/dar-functions
===================================================================
--- trunk/tools/dar/dar-functions	2007-02-22 14:11:11 UTC (rev 5191)
+++ trunk/tools/dar/dar-functions	2007-02-22 15:11:30 UTC (rev 5192)
@@ -206,7 +206,7 @@
 	fi
 	if [ "$(metaconf Dist)" == "nodist" ]; then
 		NODIST="nodist"
-		DISTS="$(echo "$DISTS" | cut -f1)"
+		DISTS="$(echo $DISTS | cut -f1)"
 	fi
 	if [ -z "$DISTS" ]; then DISTS="$DEFAULT_DISTS"; fi
 }
@@ -373,7 +373,7 @@
 
 	### FIXME: This should not be done hardcoded, rather have a list of archs inside the dist-config
 	### FIXME: And iterate through that list
-	for disttag in $DISTTAG; do
+	for disttag in $DISTTAG nodist 0; do
 		for tag in $TAGS; do
 		
 		case "$DISTARCH" in
@@ -384,10 +384,7 @@
 						-o -name "*.$tag.$disttag.athlon.rpm" \
 						-o -name "*.$disttag.$tag.noarch.rpm" \
 						-o -name "*.$disttag.$tag.i?86.rpm" \
-						-o -name "*.$disttag.$tag.athlon.rpm" \
-						-o -name "*.0.$tag.noarch.rpm" \
-						-o -name "*.0.$tag.i?86.rpm" \
-						-o -name "*.0.$tag.athlon.rpm" \) \
+						-o -name "*.$disttag.$tag.athlon.rpm" \) \
 					-exec ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ \;
 #				echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
 #				echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
@@ -401,9 +398,7 @@
 						-name "*.$tag.$disttag.noarch.rpm" \
 						-o -name "*.$tag.$disttag.$DISTARCH.rpm" \
 						-o -name "*.$disttag.$tag.noarch.rpm" \
-						-o -name "*.$disttag.$tag.$DISTARCH.rpm" \
-						-o -name "*.0.$tag.noarch.rpm" \
-						-o -name "*.0.$tag.$DISTARCH.rpm" \) \
+						-o -name "*.$disttag.$tag.$DISTARCH.rpm" \) \
 					-exec ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ \;
 #				echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
 #				echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
@@ -419,8 +414,12 @@
 
 	echo "Building Apt repo."
 
+	if [ ! -d "$TEMPDIR/.cache/genbasedir/$DISTNICK/$REPO" ]; then
+		mkdir -p "$TEMPDIR/.cache/genbasedir/$DISTNICK/$REPO"
+	fi
+
 	### Build Apt repository
-	genbasedir --flat --bloat --bz2only $FTPDIR/$DISTPATH $REPO >/dev/null
+	genbasedir --flat --bloat --cachedir="$TEMPDIR/.cache/genbasedir/$DISTNICK/$REPO" --bz2only $FTPDIR/$DISTPATH $REPO >/dev/null
 #	genbasedir --progress --flat --bloat $FTPDIR/$DISTPATH $REPO
 #	genbasedir --progress --hashonly $FTPDIR/$DISTPATH $REPO
 }
@@ -441,7 +440,7 @@
 	### FIXME: This should not be done hardcoded, rather have a list of archs inside the dist-config
 	### FIXME: And iterate through that list
 	### Hardlink files
-	for disttag in $DISTTAG; do
+	for disttag in $DISTTAG nodist 0; do
 		for tag in $TAGS; do
 
 		case "$DISTARCH" in
@@ -452,10 +451,7 @@
 						-o -name "*.$tag.$disttag.athlon.rpm" \
 						-o -name "*.$disttag.$tag.noarch.rpm" \
 						-o -name "*.$disttag.$tag.i?86.rpm" \
-						-o -name "*.$disttag.$tag.athlon.rpm" \
-						-o -name "*.0.$tag.noarch.rpm" \
-						-o -name "*.0.$tag.i?86.rpm" \
-						-o -name "*.0.$tag.athlon.rpm" \) \
+						-o -name "*.$disttag.$tag.athlon.rpm" \) \
 					-exec ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ \;
 #				echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
 #				echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
@@ -469,9 +465,7 @@
 						-name "*.$tag.$disttag.noarch.rpm" \
 						-o -name "*.$tag.$disttag.$DISTARCH.rpm" \
 						-o -name "*.$disttag.$tag.noarch.rpm" \
-						-o -name "*.$disttag.$tag.$DISTARCH.rpm" \
-						-o -name "*.0.$tag.noarch.rpm" \
-						-o -name "*.0.$tag.$DISTARCH.rpm" \) \
+						-o -name "*.$disttag.$tag.$DISTARCH.rpm" \) \
 					-exec ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ \;
 #				echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
 #				echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null