packages: builder - expand %rpm_build_macros to empty if missing

glen glen at pld-linux.org
Fri Feb 19 11:41:26 CET 2010


Author: glen                         Date: Fri Feb 19 10:41:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- expand %rpm_build_macros to empty if missing

---- Files affected:
packages:
   builder (1.607 -> 1.608) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.607 packages/builder:1.608
--- packages/builder:1.607	Fri Feb 19 11:34:44 2010
+++ packages/builder	Fri Feb 19 11:41:20 2010
@@ -666,7 +666,7 @@
 	if [ "$NOINIT" != "yes" ] ; then
 		TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
 
-		local macros_ver=$(rpm -E %rpm_build_macros)
+		local macros_ver=$(rpm -E %?rpm_build_macros)
 		if [ -z "$macros_ver" ]; then
 			REPO_DIR=$TOP_DIR/packages
 			PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.607&r2=1.608&f=u



More information about the pld-cvs-commit mailing list