napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifications

Browse Source 
- [bootloader] Fix vfat_correct_case
- [welcome] Fix RequirementsChecker::checkHasInternet()
This commit is contained in:
Philip 2016-11-05 22:01:44 +01:00
parent 77ea82baee
commit c8f1134196
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/bootloader/main.py
View File

@ -253,7 +253,7 @@ def install_grub(efi_directory, fw_type):
def vfat_correct_case(parent, name): def vfat_correct_case(parent, name):
for candidate in os.listdir(parent): for candidate in os.listdir(parent):
if name.lower() == candidate.lower(): if name.lower() == candidate.lower():
return candidate return os.path.join(parent, candidate)
return os.path.join(parent, name) return os.path.join(parent, name)

2
src/modules/welcome/checker/RequirementsChecker.cpp
View File

@ -347,7 +347,7 @@ RequirementsChecker::checkHasInternet()
QDBusConnection::systemBus(), 0 ); QDBusConnection::systemBus(), 0 );
bool ok = false; bool ok = false;
int nmState = nmIntf.property( "state" ).toInt( &ok ); int nmState = nmIntf.property( "State" ).toInt( &ok );
if ( !ok || !nmIntf.isValid() ) if ( !ok || !nmIntf.isValid() )
{ {