changeset 223:6cbe6a8597db

USASR-2244: Attempt to simplify changes to init script by placing hg pull in findSnapshotVersion method
author Christopher Springer <springer@nwoca.org>
date Thu, 07 Jul 2016 16:33:50 +0100
parents b3cb5db317a0
children f2495310ee69
files init20.gradle
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/init20.gradle	Thu Jul 07 16:25:34 2016 +0100
+++ b/init20.gradle	Thu Jul 07 16:33:50 2016 +0100
@@ -48,17 +48,11 @@
 gradle.ext.buildTimestamp = System.currentTimeMillis().toString().padLeft(14, '0')
 
 gradle.ext.hgRepositoryUrl = ""
+
 try {
     gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['', ''])[1].trim()
 } catch (e) {
 }
-try {
-	if (gradle.ext.bambooBuild) {
-		"hg pull".execute()
-	}
-} catch (e) {
-    logger.error "exception thrown attempting to pull all changesets from mercurial", e 
-}
 
 def springModuleTranslator = [
         'spring-transaction': 'spring-tx',
@@ -804,6 +798,7 @@
     }
 
     private findSnapshotVersion() {
+		"hg pull".execute()
         def versions = "hg branches --closed".execute().text.split('\n').findAll {
             it.startsWith( 'release') || it.startsWith( 'hotfix')
         }.collect {