From e21338d81ec9deb20a0818e1829ce5145736bac7 Mon Sep 17 00:00:00 2001 From: Philip Date: Sat, 5 Nov 2016 22:01:44 +0100 Subject: [PATCH] Modifications - [bootloader] Fix vfat_correct_case - [welcome] Fix RequirementsChecker::checkHasInternet() --- src/modules/bootloader/main.py | 2 +- src/modules/welcome/checker/RequirementsChecker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index e367eebbb..c009443da 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -253,7 +253,7 @@ def install_grub(efi_directory, fw_type): def vfat_correct_case(parent, name): for candidate in os.listdir(parent): if name.lower() == candidate.lower(): - return candidate + return os.path.join(parent, candidate) return os.path.join(parent, name) diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp index a8207a876..f77847cf7 100644 --- a/src/modules/welcome/checker/RequirementsChecker.cpp +++ b/src/modules/welcome/checker/RequirementsChecker.cpp @@ -347,7 +347,7 @@ RequirementsChecker::checkHasInternet() QDBusConnection::systemBus(), 0 ); bool ok = false; - int nmState = nmIntf.property( "state" ).toInt( &ok ); + int nmState = nmIntf.property( "State" ).toInt( &ok ); if ( !ok || !nmIntf.isValid() ) {