--- a/common/build.postbuild.xml	Tue Oct 06 10:40:00 2009 +0100
+++ b/common/build.postbuild.xml	Tue Oct 06 11:58:10 2009 +0100
@@ -511,10 +511,10 @@
             <then>
                 <!-- Try to obtain the diamonds ID for this build -->
                 <if>
-                    <isset property="diamonds.build.id"/>
-                    <else>
-                        <property file="${build.log.dir}/diamonds.build.id.properties"/> <!-- This will fail silently -->
-                    </else>
+                    <not><isset property="diamonds.build.id"/></not>
+                    <then>
+                        <property file="${build.log.dir}/diamonds_build_id.properties"/> <!-- This will fail silently -->
+                    </then>
                 </if>
                 <if>
                     <isset property="diamonds.build.id"/>
@@ -525,7 +525,7 @@
                             <arg value="-s"/>
                             <arg value="${diamonds.host}"/>
                             <arg value="-u"/>
-                            <arg value="/diamonds/builds/${diamonds.build.id}"/>
+                            <arg value="${diamonds.build.id}"/>
                             <arg value="-f"/>
                             <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
                         </exec>

--- a/common/build.xml	Tue Oct 06 10:40:00 2009 +0100
+++ b/common/build.xml	Tue Oct 06 11:58:10 2009 +0100
@@ -203,8 +203,8 @@
         <then>
           <echo>[SF-DIAMONDS-TAG-BUILD]</echo>
           <runtarget target="diamonds"/>
-          <echo message="Save Diamonds build id value in a file"/>
-          <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.txt"/>
+          <echo message="Save Diamonds build id value (${diamonds.build.id}) in a file"/>
+          <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.properties"/>
           <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-tag-build.xml.ftl" outputFile="${build.drive}/output/logs/sf-tag-build.xml">
             <data expandProperties="yes">
               ant: antProperties()