From c048aecb4858286a1516dba50317b4568f0d5c3d Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 22 Dec 2021 11:54:43 +0200 Subject: Do not replace conflicting remote packages silently with locals On (tree)name conflicts with other than the same component in local and remote packages - instead of silently replacing the remote package with local, do one of the following: - Remote package A may have declared the same tree name as installed local package B. Catch the case and re-register package A as an unstable component with the original name, if possible. - Remote package A may have declared a tree name that conflicts with local package B's name. Do not register component A. Change-Id: I16ac583ea10bf203d8b8d0b19e6890f03cf0067a Reviewed-by: Katja Marttila --- tests/auto/installer/treename/settings.qrc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/installer/treename/settings.qrc') diff --git a/tests/auto/installer/treename/settings.qrc b/tests/auto/installer/treename/settings.qrc index eab771bee..9b31cbade 100644 --- a/tests/auto/installer/treename/settings.qrc +++ b/tests/auto/installer/treename/settings.qrc @@ -1,5 +1,7 @@ + data/components.xml + data/repository/Updates.xml data/repository/componentA/1.0.0meta.7z data/repository/componentA/1.0.0content.7z -- cgit v1.2.3