One level of meta too high was being marked as released when importing an already released component (from a release repository)

This commit is contained in:
Dan Hawkins 2019-06-06 13:30:15 +01:00
commit 2c5caba8ec
2 changed files with 2 additions and 1 deletions

View file

@ -68,7 +68,7 @@ def hierarchyartifactimportfromrepo(meta, String repo, String revision, String d
gh.stripgithistory(destpath)
def metafilepath = "${destpath}/${meta.metafilepath()}"
echo "Marking root meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(meta, metafilepath)
rewritemetafileasreleased(importedmeta, metafilepath)
if (incrementversionnumber) {
meta.buildstampinfo.changerevision(versiongenerator.incrementrevision(meta.buildstampinfo.revision, importedmeta.buildstampinfo.revision))

View file

@ -491,6 +491,7 @@ class MetaInfo extends GISJsonSerialised {
}
void markreleased() {
script.echo("Marking product: ${productinfo.productname} component: ${productinfo.subcomponentname} as released")
releaseinfo.markreleased()
for (associated in associatedmeta) {
associated.meta.releaseinfo.markreleased()