diff options
author | Robert Griebl <robert.griebl@qt.io> | 2021-11-16 11:58:07 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-16 19:58:48 +0000 |
commit | 7a9be4798530df4828a6d3b919542c9711723388 (patch) | |
tree | c64965203926a7cfd98b13dbcff695201b7f7ffb | |
parent | 15932be0271a16f423ccb6b8145d5f4aed4d10cc (diff) | |
download | qtapplicationmanager-7a9be4798530df4828a6d3b919542c9711723388.tar.gz |
Add the missing "allowUnsignedPackages" flag to the config parser
I forgot to add the flag to the YAML parser, when I added this feature
back in commit 7ead83968af5676dab0724fbba84cb00bffca750
Change-Id: I8bd3ac7a2d167d5f95f3cbc9ae9e42b3228df675
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit fc467c318982ee9b940589f3c78a9bd4da10e37e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/main-lib/configuration.cpp | 2 | ||||
-rw-r--r-- | tests/auto/applicationinstaller/tst_applicationinstaller.cpp | 6 | ||||
-rw-r--r-- | tests/auto/configuration/data/config1.yaml | 1 | ||||
-rw-r--r-- | tests/auto/configuration/tst_configuration.cpp | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp index b48bb9d6..4e75cf91 100644 --- a/src/main-lib/configuration.cpp +++ b/src/main-lib/configuration.cpp @@ -814,6 +814,8 @@ ConfigurationData *ConfigurationData::loadFromSource(QIODevice *source, const QS cd->flags.developmentMode = p->parseScalar().toBool(); } }, { "noUiWatchdog", false, YamlParser::Scalar, [&cd](YamlParser *p) { cd->flags.noUiWatchdog = p->parseScalar().toBool(); } }, + { "allowUnsignedPackages", false, YamlParser::Scalar, [&cd](YamlParser *p) { + cd->flags.allowUnsignedPackages = p->parseScalar().toBool(); } }, }); } }, { "wayland", false, YamlParser::Map, [&cd](YamlParser *p) { p->parseFields({ diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp index 7160e551..a53e1cfb 100644 --- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp +++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp @@ -59,7 +59,7 @@ class AllowInstallations { public: enum Type { - AllowUnsinged, + AllowUnsigned, RequireDevSigned, RequireStoreSigned }; @@ -69,7 +69,7 @@ public: , m_oldDevMode(PackageManager::instance()->developmentMode()) { switch (t) { - case AllowUnsinged: + case AllowUnsigned: PackageManager::instance()->setAllowInstallationOfUnsignedPackages(true); PackageManager::instance()->setDevelopmentMode(false); break; @@ -439,7 +439,7 @@ void tst_PackageManager::packageInstallation() AllowInstallations allow(storeSigned ? AllowInstallations::RequireStoreSigned : (devSigned ? AllowInstallations::RequireDevSigned - : AllowInstallations::AllowUnsinged)); + : AllowInstallations::AllowUnsigned)); int lastPass = (updatePackageName.isEmpty() ? 1 : 2); // pass 1 is the installation / pass 2 is the update (if needed) diff --git a/tests/auto/configuration/data/config1.yaml b/tests/auto/configuration/data/config1.yaml index 06954344..3e6d939f 100644 --- a/tests/auto/configuration/data/config1.yaml +++ b/tests/auto/configuration/data/config1.yaml @@ -84,6 +84,7 @@ flags: noSecurity: true developmentMode: true noUiWatchdog: true + allowUnsignedPackages: true wayland: socketName: "my-wlsock-42" diff --git a/tests/auto/configuration/tst_configuration.cpp b/tests/auto/configuration/tst_configuration.cpp index 02e03338..e54d62f5 100644 --- a/tests/auto/configuration/tst_configuration.cpp +++ b/tests/auto/configuration/tst_configuration.cpp @@ -93,6 +93,7 @@ void tst_Configuration::defaultConfig() QCOMPARE(c.noSecurity(), false); QCOMPARE(c.developmentMode(), false); QCOMPARE(c.noUiWatchdog(), false); + QCOMPARE(c.allowUnsignedPackages(), false); QCOMPARE(c.forceSingleProcess(), false); QCOMPARE(c.forceMultiProcess(), false); QCOMPARE(c.loggingRules(), {}); @@ -176,6 +177,7 @@ void tst_Configuration::simpleConfig() QCOMPARE(c.noSecurity(), true); QCOMPARE(c.developmentMode(), true); QCOMPARE(c.noUiWatchdog(), true); + QCOMPARE(c.allowUnsignedPackages(), true); QCOMPARE(c.forceSingleProcess(), true); QCOMPARE(c.forceMultiProcess(), true); QCOMPARE(c.loggingRules(), QStringList({ qSL("lr1"), qSL("lr2") })); @@ -305,6 +307,7 @@ void tst_Configuration::mergedConfig() QCOMPARE(c.noSecurity(), true); QCOMPARE(c.developmentMode(), true); QCOMPARE(c.noUiWatchdog(), true); + QCOMPARE(c.allowUnsignedPackages(), true); QCOMPARE(c.forceSingleProcess(), true); QCOMPARE(c.forceMultiProcess(), true); QCOMPARE(c.loggingRules(), QStringList({ qSL("lr1"), qSL("lr2"), qSL("lr3") })); |