From 603e13cb818ff91a271a2028981d33bd9889b463 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 3 Dec 2021 10:12:01 +0000 Subject: [PATCH] Handle pre-generated buildnumber --- meta/folder.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index c5a5309..9951485 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -295,14 +295,16 @@ class BuildStampInfo extends GISJsonSerialised { // Override the buildstamp void override(String buildstamp) { - def s = buildstamp.split('\\.') + this.buildstamp = buildstamp + script.echo("Build stamp overridden to: ${this.buildstamp}") + def s = this.buildstamp.split('\\.') if (s.size() != 4) { script.error("Overriding build stamp: ${buildstamp} is not of the format: 1.2.3.4") } this.stampprefix = "${s[0]}.${s[1]}.${s[2]}" + script.echo("Stamp prefix overridden to: ${this.stampprefix}") this.revision = s[3].toInteger() - this.buildstamp = buildstamp - script.echo("Build stamp overridden to: ${this.buildstamp}") + script.echo("Revision overridden to: ${this.revision}") } String buildstampcommasep() {