From 4c2474ddc50674e1e08bc0d798e71cf39e4834f0 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sat, 12 Aug 2017 10:23:36 +0200 Subject: better management of DESKTOP_SESSION (mga#21454) use XDG_CURRENT_DESKTOP instead of reporting "unknown" --- usr/share/mageiawelcome/mageiawelcome.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'usr') diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index 5f14890..cbad80a 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -50,14 +50,15 @@ def main(): arch = '32-bit' home = os.getenv("HOME") username = os.getenv("USER") - if os.getenv("DESKTOP_SESSION") != "" : + try: desktop = get_desktop_name(os.path.basename(os.getenv("DESKTOP_SESSION"))) - else: + except: desktop = 'Other' if desktop == 'Other': desktop = get_desktop_name2(os.getenv("XDG_CURRENT_DESKTOP")) - + if desktop == 'unknown': + desktop = os.getenv("XDG_CURRENT_DESKTOP") #collect packages nad its status listapp = get_listapp() -- cgit v1.2.1