dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1633
fixes bug(s): https://launchpad.net/bugs/537522
committer: Saptarshi <sunbiz@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-11 20:16:22 +0100
message:
  Continue build if bzr missing and printing "NA" in about when no revision info available
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
  dhis-2/dhis-web/dhis-web-commons/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-03-09 10:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm	2010-03-11 19:16:22 +0000
@@ -3,7 +3,7 @@
 <dl>
   <dt>$i18n.getString( "current_user" ):</dt><dd>$!currentUsername</dd>
   <dt>$i18n.getString( "version" ):</dt><dd>$!version</dd>
-  <dt>$i18n.getString( "build_revision" ):</dt><dd>$!revision</dd>
+  <dt>$i18n.getString( "build_revision" ):</dt><dd>#if( $revision == '${revision}' ) NA #else $!revision #end</dd>
   <dt>$i18n.getString( "build_date" ):</dt><dd>$format.formatDateTime( $!buildTime )</dd>
   <dt>$i18n.getString( "user_agent" ):</dt><dd>$!userAgent</dd>
   <dt>$i18n.getString( "external_configuration_directory" ):</dt><dd>$!externalDirectory</dd>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-03-05 20:54:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2010-03-11 19:16:22 +0000
@@ -26,7 +26,7 @@
                   <format property="now" pattern="yyyy-MM-dd HH:mm:ss"/>
                 </tstamp>
                 <mkdir dir="${project.build.outputDirectory}"/>
-                <exec executable="bzr" outputproperty="revision">
+                <exec executable="bzr" outputproperty="revision" failifexecutionfails="false">
                       <arg value="revno"/>
                 </exec>
                 <echo file="${project.build.outputDirectory}/build.properties"