diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-12-22 11:54:43 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-06 13:06:28 +0200 |
| commit | c048aecb4858286a1516dba50317b4568f0d5c3d (patch) | |
| tree | 9565c33387ca7cc6f665182ddbf22847288ffee0 /tests/auto/installer/treename/settings.qrc | |
| parent | 46ce6b3127061b4645ef91fe0a63119337da4848 (diff) | |
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 <katja.marttila@qt.io>
Diffstat (limited to 'tests/auto/installer/treename/settings.qrc')
| -rw-r--r-- | tests/auto/installer/treename/settings.qrc | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ <RCC> <qresource prefix="/"> + <file>data/components.xml</file> + <file>data/repository/Updates.xml</file> <file>data/repository/componentA/1.0.0meta.7z</file> <file>data/repository/componentA/1.0.0content.7z</file> |