SVN: toys/tools/cleanbuild/cleanbuild

glen glen at pld-linux.org
Thu Oct 25 19:41:09 CEST 2012


Author: glen
Date: Thu Oct 25 19:41:09 2012
New Revision: 12595

Modified:
   toys/tools/cleanbuild/cleanbuild
Log:
partial rpm5 support

Modified: toys/tools/cleanbuild/cleanbuild
==============================================================================
--- toys/tools/cleanbuild/cleanbuild	(original)
+++ toys/tools/cleanbuild/cleanbuild	Thu Oct 25 19:41:09 2012
@@ -286,7 +286,14 @@
 	mount -t tmpfs -o size=$CHROOTSIZE,relatime /dev/null $CHDIR
 	echo $$ > $CHDIR/.pid
 
-	rpm --root=$CHDIR --initdb
+	rpmversion=$(rpm -E '%(v=%{_rpmversion}; IFS=.; set -- $v; echo $1)')
+	rpmversion=${rpmversion:-4}
+
+	if [ "$rpmversion" -ge 5 ]; then
+		rpm --root=$CHDIR -qa
+	else
+		rpm --root=$CHDIR --initdb
+	fi
 	poldek --up || :
 	poldek -O "ignore=$IGNORE" -u rpm-build pwdutils coreutils
 	echo Poldek exit: $?


More information about the pld-cvs-commit mailing list