Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 718424
Collapse All | Expand All

(-)a/Nagstamon/Helpers.py (-3 / +7 lines)
Lines 454-467 Link Here
454
            for property in os_release_file.read_text().splitlines():
454
            for property in os_release_file.read_text().splitlines():
455
                key, value = property.split('=', 1)
455
                key, value = property.split('=', 1)
456
                os_release_dict[key] = value.strip('"').strip("'")
456
                os_release_dict[key] = value.strip('"').strip("'")
457
            return (os_release_dict['ID'], os_release_dict['VERSION_ID'], os_release_dict['NAME'])
457
            return (os_release_dict.get('ID').lower(),
458
                    os_release_dict.get('VERSION_ID', 'unknown').lower(),
459
                    os_release_dict.get('NAME').lower())
458
        else:
460
        else:
459
            return False
461
            return False
460
    else:
462
    else:
461
        return platform.dist()
463
        # fix for non-working build on Debian<10
464
        dist_name, dist_version, dist_id = platform.dist()
465
        return dist_name.lower(), dist_version, dist_id
462
466
463
467
464
    # depending on column different functions have to be used
468
# depending on column different functions have to be used
465
# 0 + 1 are column "Hosts", 1 + 2 are column "Service" due to extra font flag pictograms
469
# 0 + 1 are column "Hosts", 1 + 2 are column "Service" due to extra font flag pictograms
466
SORT_COLUMNS_FUNCTIONS = {0: compare_host,
470
SORT_COLUMNS_FUNCTIONS = {0: compare_host,
467
        1: compare_host,
471
        1: compare_host,

Return to bug 718424