summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--usr/share/mageiawelcome/mageiawelcome.py7
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ae22f99..fe6465b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ DIRS = etc usr po
FILES = $(TEXT_FILES) $(DIRS) LICENSE
+check:
+ /usr/bin/python3 -m pyflakes usr/share/mageiawelcome/*.py
+
clean:
rm -f *~ \#*\#
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()