diff --git a/product/info.groovy b/product/info.groovy index be95978..18c7ac2 100644 --- a/product/info.groovy +++ b/product/info.groovy @@ -103,10 +103,9 @@ class ProductParsed { } } -def LinkedHashMap products = new LinkedHashMap() +LinkedHashMap products = new LinkedHashMap() -def addProductEntry(LinkedHashMap products, - String productvariant, +def addProductEntry(String productvariant, String releaserepo) { def productparsed if (products.get(releaserepo) == null) { // Use the first entry name only @@ -121,8 +120,7 @@ def addProductEntry(LinkedHashMap products, def parseproductdependencies(productreleasemeta, String productreleasefolder, String containingproductvariant, - ProductRelease productrelease, - LinkedHashMap products) { + ProductRelease productrelease) { def dependentmeta = productreleasemeta.getassociated(productreleasefolder) for (meta in dependentmeta) { @@ -165,7 +163,8 @@ def parseproductrepo(String productrepo, if (!productvariant) { productvariant = productreleasemeta.productvariant() - pp = addProductEntry(productvariant, productrepo) + pp = addProductEntry(products, + productvariant, productrepo) } def productrelease = new ProductRelease(sha, @@ -174,8 +173,7 @@ def parseproductrepo(String productrepo, parseproductdependencies(productreleasemeta, productreleasefolder, productvariant, - productrelease, - products) + productrelease) pp.addProductRelease(productrelease) } pp.markparsed()