From 5db7c8dd22cfb8d0b4dfa94f56c53fac2e35b65b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Mar 2022 21:33:17 +0000 Subject: [PATCH] Provide a product variant translation table --- product/info.groovy | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/product/info.groovy b/product/info.groovy index 937b22c..c6cccff 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -150,25 +150,28 @@ def parseproductdependencies(LinkedHashMap productcollect def dependentmeta = productreleasemeta.getassociated(productreleasefolder) for (meta in dependentmeta) { - if (meta.productvariant() && meta.productinfo.subcomponentname) { + def translatedproductvariant = translateproductvariant(productvarianttranslation, + releaserepo, + meta.productvariant()) + if (translatedproductvariant && meta.productinfo.subcomponentname) { def pd = new ProductDependency(this, rt, - meta.productvariant(), + translatedproductvariant, meta.releasetag(), meta.releaseinfo.releaserepoURL) pd.setreleasestate() - if (meta.productinfo.subcomponentname == 'WHOLE' && meta.productvariant() != '') { - if (meta.productvariant() != containingproductvariant) { // Don't add myself + if (meta.productinfo.subcomponentname == 'WHOLE' && translatedproductvariant) { + if (translatedproductvariant != containingproductvariant) { // Don't add myself addProductEntry(productcollection, productvarianttranslation, - meta.productvariant(), + translatedproductvariant, meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } - } else if (meta.productvariant() != containingproductvariant && meta.productvariant() != '') { + } else if (translatedproductvariant != containingproductvariant && translatedproductvariant) { addProductEntry(productcollection, productvarianttranslation, - meta.productvariant(), + translatedproductvariant, meta.releaseinfo.releaserepoURL) productrelease.addProductDependency(pd) } else {