From ab4165ebc0e3a679da1c7a343671efb93bf002b4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 12 Mar 2022 23:22:12 +0000 Subject: [PATCH] Debug sha/tags table --- product/info.groovy | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 0ae2779..5a1dfaf 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -134,29 +134,33 @@ def parseproductdependencies(LinkedHashMap productcollect def dependentmeta = productreleasemeta.getassociated(productreleasefolder) for (meta in dependentmeta) { - def pd = new ProductDependency(this, - rt, - meta.productvariant(), - meta.releasetag(), - meta.releaseinfo.releaserepoURL) - pd.setreleasestate() - if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { - if (meta.productvariant() != containingproductvariant) { // Don't add myself + if (meta.productvariant() && meta.productinfo.subcomponentname) { + def pd = new ProductDependency(this, + rt, + meta.productvariant(), + meta.releasetag(), + meta.releaseinfo.releaserepoURL) + pd.setreleasestate() + if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { + if (meta.productvariant() != containingproductvariant) { // Don't add myself + addProductEntry(productcollection, + meta.productvariant(), + meta.releaseinfo.releaserepoURL) + productrelease.addProductDependency(pd) + } + } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { addProductEntry(productcollection, meta.productvariant(), meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) + } else { + def pc = new ProductComponent(meta.productinfo.subcomponentname, + meta.releasetag(), + meta.releaseinfo.releaserepoURL) + productrelease.addProductComponent(pc) } - } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { - addProductEntry(productcollection, - meta.productvariant(), - meta.releaseinfo.releaserepoURL) - productrelease.addProductDependency(pd) } else { - def pc = new ProductComponent(meta.productinfo.subcomponentname, - meta.releasetag(), - meta.releaseinfo.releaserepoURL) - productrelease.addProductComponent(pc) + echo "Ignoring unnamed dependency in ${productreleasemeta.productvariant()}" } } }