From ceea9f7c5b2feb155a2b61d8e848fee81606af5a Mon Sep 17 00:00:00 2001 From: crouzet Date: Mon, 19 Dec 2022 15:47:20 +0100 Subject: [PATCH] sat #33093 : support archive_prefix pour les produits pip --- commands/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/commands/package.py b/commands/package.py index 2117ee4..88e59f3 100644 --- a/commands/package.py +++ b/commands/package.py @@ -1001,8 +1001,12 @@ def get_archives(config, logger): src.product.product_test_property(p_info,"pip", "yes")): # if pip mode is activated, and product is managed by pip pip_wheels_dir=os.path.join(config.LOCAL.archive_dir,"wheels") - pip_wheel_pattern=os.path.join(pip_wheels_dir, - "%s-%s*" % (p_info.name, p_info.version)) + if "archive_prefix" in p_info.archive_info and p_info.archive_info.archive_prefix: + pip_wheel_pattern=os.path.join(pip_wheels_dir, + "%s-%s*" % (p_info.archive_info.archive_prefix, p_info.version)) + else: + pip_wheel_pattern=os.path.join(pip_wheels_dir, + "%s-%s*" % (p_info.name, p_info.version)) pip_wheel_path=glob.glob(pip_wheel_pattern) msg_pip_not_found="Error in get_archive, pip wheel for "\ "product %s-%s was not found in %s directory" -- 2.30.2