offsetpath field in meta files was absolute; should be relative to workspace

This commit is contained in:
Dan Hawkins 2019-02-26 17:05:25 +00:00
commit dc6e7c6b1d

View file

@ -556,12 +556,15 @@ class MetaInfo extends GISJsonSerialised {
String relativize(String path) {
def Path mypath = Paths.get(path)
String pathRelative
if (mypath.startsWith(script.WORKSPACE)) {
script.echo("Seeing if ${path} begins with from ${script.WORKSPACE}")
if (path.startsWith(script.WORKSPACE)) {
def Path wspath = Paths.get(script.WORKSPACE)
def Path wsrelativePath = wspath.relativize(mypath)
pathRelative = wsrelativePath.toString()
script.echo("Extracted ${pathRelative} from ${wspath.toString()} and ${mypath.toString()}"
} else {
pathRelative = mypath.toString()
script.echo("Path relative is unchanged: ${pathRelative}"
}
return pathRelative
}