[darwinbuild-changes] [240] trunk/darwinbuild/darwinbuild.common

[source_changes at macosforge.org]

Revision: 240
          http://trac.macosforge.org/projects/darwinbuild/changeset/240
Author:   ssen
Date:     2006-10-04 02:01:36 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
After we install a pre-built root, check if it installed
a receipt. If not, generate one ourself based on a hash
of the tarball.

Modified Paths:
--------------
    trunk/darwinbuild/darwinbuild.common

Modified: trunk/darwinbuild/darwinbuild.common
===================================================================
--- trunk/darwinbuild/darwinbuild.common	2005-09-14 01:07:05 UTC (rev 239)
+++ trunk/darwinbuild/darwinbuild.common	2006-10-04 09:01:36 UTC (rev 240)
@@ -211,8 +211,11 @@
 					tar tzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz | \
 						"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 						> /dev/null
-					echo | CreateReceipt "$BuildRoot" "$Project" "root" \
+					CheckForReceipt "$BuildRoot" "$Project" "root"
+					if [ $? -ne 0 ]; then
+					    echo | CreateReceipt "$BuildRoot" "$Project" "root" \
 						"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
+					fi
 					return 0
 				fi
 			else
@@ -342,8 +345,11 @@
 					tar tzf $CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz | \
 						"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 						> /dev/null
-					echo | CreateReceipt "$BuildRoot" "$Project" "hdrs" \
+					CheckForReceipt "$BuildRoot" "$Project" "hdrs"
+					if [ $? -ne 0 ]; then
+					    echo | CreateReceipt "$BuildRoot" "$Project" "hdrs" \
 						"$CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz"
+					fi
 					return 0
 				fi
 			else
@@ -359,8 +365,11 @@
 						tar tzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz | \
 							"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 							> /dev/null
-						echo | CreateReceipt "$BuildRoot" "$Project" "root" \
+						CheckForReceipt "$BuildRoot" "$Project" "root"
+						if [ $? -ne 0 ]; then
+						    echo | CreateReceipt "$BuildRoot" "$Project" "root" \
 							"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
+						fi
 						return 0
 					fi
 				else

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20061004/08608961/attachment.html