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

[source_changes at macosforge.org]

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

Log Message:
-----------
If asked to create a fake hash based on a tarball, be nice
and embed the path in the receipt.

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

Modified: trunk/darwinbuild/darwinbuild.common
===================================================================
--- trunk/darwinbuild/darwinbuild.common	2005-09-14 01:08:00 UTC (rev 240)
+++ trunk/darwinbuild/darwinbuild.common	2006-10-04 09:01:42 UTC (rev 241)
@@ -213,7 +213,7 @@
 						> /dev/null
 					CheckForReceipt "$BuildRoot" "$Project" "root"
 					if [ $? -ne 0 ]; then
-					    echo | CreateReceipt "$BuildRoot" "$Project" "root" \
+					    echo -n | CreateReceipt "$BuildRoot" "$Project" "root" \
 						"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
 					fi
 					return 0
@@ -347,7 +347,7 @@
 						> /dev/null
 					CheckForReceipt "$BuildRoot" "$Project" "hdrs"
 					if [ $? -ne 0 ]; then
-					    echo | CreateReceipt "$BuildRoot" "$Project" "hdrs" \
+					    echo -n | CreateReceipt "$BuildRoot" "$Project" "hdrs" \
 						"$CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz"
 					fi
 					return 0
@@ -367,7 +367,7 @@
 							> /dev/null
 						CheckForReceipt "$BuildRoot" "$Project" "root"
 						if [ $? -ne 0 ]; then
-						    echo | CreateReceipt "$BuildRoot" "$Project" "root" \
+						    echo -n | CreateReceipt "$BuildRoot" "$Project" "root" \
 							"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
 						fi
 						return 0
@@ -491,6 +491,7 @@
 	    exit 1
 	fi
 	Hash=$(openssl dgst -sha1 < "$HashSource")
+	echo "# Hash of $HashSource" >> "$TmpFile"
     else
 	Hash=$(openssl dgst -sha1 < "$TmpFile")
     fi

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