From 446109e3d5aa15c0571d3efc624775c3182c83a2 Mon Sep 17 00:00:00 2001 From: memsharded Date: Tue, 5 Jul 2022 18:54:16 +0200 Subject: [PATCH] swap validate-packageid --- conans/client/graph/graph_binaries.py | 12 ++++++------ conans/model/info.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conans/client/graph/graph_binaries.py b/conans/client/graph/graph_binaries.py index 103832b2a03..b8962ffd9bb 100644 --- a/conans/client/graph/graph_binaries.py +++ b/conans/client/graph/graph_binaries.py @@ -385,12 +385,6 @@ def _compute_package_id(self, node, default_package_id_mode, default_python_requ if apple_clang_compatible: conanfile.compatible_packages.append(apple_clang_compatible) - # Once we are done, call package_id() to narrow and change possible values - with conanfile_exception_formatter(str(conanfile), "package_id"): - with conan_v2_property(conanfile, 'cpp_info', - "'self.cpp_info' access in package_id() method is deprecated"): - conanfile.package_id() - if hasattr(conanfile, "validate") and callable(conanfile.validate): with conanfile_exception_formatter(str(conanfile), "validate"): try: @@ -400,6 +394,12 @@ def _compute_package_id(self, node, default_package_id_mode, default_python_requ except ConanInvalidConfiguration as e: conanfile.info.invalid = str(e) + # Once we are done, call package_id() to narrow and change possible values + with conanfile_exception_formatter(str(conanfile), "package_id"): + with conan_v2_property(conanfile, 'cpp_info', + "'self.cpp_info' access in package_id() method is deprecated"): + conanfile.package_id() + info = conanfile.info node.package_id = info.package_id() diff --git a/conans/model/info.py b/conans/model/info.py index 049dd8a9452..f5c8a70c775 100644 --- a/conans/model/info.py +++ b/conans/model/info.py @@ -433,7 +433,7 @@ def copy(self): """ Useful for build_id implementation """ result = ConanInfo() - result.invalid = self.invalid + result.invalid = None # self.invalid result.settings = self.settings.copy() result.options = self.options.copy() result.requires = self.requires.copy()