From d7ada4e0d84c48ff53de9c65d101b957b68236e8 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 22 Jun 2017 14:27:58 +0300 Subject: Fix install type if --online-only passed to binarycreator Binarycreator assumed that install type is offline if no repositories was set although --online-only was set. However, repositories might be set later, for example in producetkeycheck::init(). Change-Id: Idd6d0e3304974773baefe3773be7e2948704575c Reviewed-by: Iikka Eklund --- tools/binarycreator/binarycreator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index e74f8a18c..593110c8f 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -771,8 +771,11 @@ int main(int argc, char **argv) { QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini") , QSettings::IniFormat); - // assume offline installer if there are no repositories - offlineOnly |= settings.repositories().isEmpty(); + // assume offline installer if there are no repositories and no + //--online-only not set + offlineOnly = offlineOnly | settings.repositories().isEmpty(); + if (onlineOnly) + offlineOnly = !onlineOnly; confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly); } -- cgit v1.2.3