From c92a512cb7c7b5f35fb24e9bd36f50be8e26e763 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 15 Sep 2021 20:08:28 +0300 Subject: Change semantics for ?sys: in pkg-build if no package configuration is explicitly specified Now, if configuration is not specified for a system dependency package, then it is assumed to be specified for all current configurations and their explicitly linked configurations, recursively, including private configurations that can potentially be created during this run. --- tests/pkg-system.testscript | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/pkg-system.testscript') diff --git a/tests/pkg-system.testscript b/tests/pkg-system.testscript index 3ff1b55..e300afd 100644 --- a/tests/pkg-system.testscript +++ b/tests/pkg-system.testscript @@ -90,28 +90,28 @@ rep_remove += -d cfg 2>! { $clone_cfg; - $pkg_build 'sys:libbar' '?sys:libbar' 2>>EOE != 0; + $pkg_build 'sys:libbar' 'sys:libbar/1.0.0' 2>>EOE != 0; error: duplicate package libbar info: first mentioned as sys:libbar - info: second mentioned as ?sys:libbar + info: second mentioned as sys:libbar/1.0.0 EOE - $pkg_build '?sys:libbar' 'sys:libbar' 2>>EOE != 0; + $pkg_build '?sys:libbar' '?sys:libbar/1.0.0' 2>>EOE != 0; error: duplicate package libbar info: first mentioned as ?sys:libbar - info: second mentioned as sys:libbar + info: second mentioned as ?sys:libbar/1.0.0 EOE - $pkg_build '?sys:libbar' libbar 2>>EOE != 0; + $pkg_build 'sys:libbar' libbar 2>>EOE != 0; error: duplicate package libbar - info: first mentioned as ?sys:libbar + info: first mentioned as sys:libbar info: second mentioned as libbar EOE - $pkg_build libbar '?sys:libbar' 2>>EOE != 0; + $pkg_build ?libbar '?sys:libbar' +{ --config-id 0 } 2>>EOE != 0; error: duplicate package libbar - info: first mentioned as libbar - info: second mentioned as ?sys:libbar + info: first mentioned as ?libbar + info: second mentioned as ?sys:libbar +{ --config-id 0 } EOE $pkg_build 'sys:libbar' libbar 2>>EOE != 0; -- cgit v1.1