diff options
| author | Papoteur <papoteur@mageia.org> | 2017-08-10 13:56:07 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2017-08-10 13:56:07 +0200 |
| commit | 096701893d70a9e75cb9839ad37ad50a55f68f2f (patch) | |
| tree | bfda50437fd38edff7282a44bbbef252b8dbca92 | |
| parent | f166784ca008dac79f42c4287b5753ac3d5b78ff (diff) | |
| download | mageiawelcome-096701893d70a9e75cb9839ad37ad50a55f68f2f.tar mageiawelcome-096701893d70a9e75cb9839ad37ad50a55f68f2f.tar.gz mageiawelcome-096701893d70a9e75cb9839ad37ad50a55f68f2f.tar.bz2 mageiawelcome-096701893d70a9e75cb9839ad37ad50a55f68f2f.tar.xz mageiawelcome-096701893d70a9e75cb9839ad37ad50a55f68f2f.zip | |
ignore DESKTOP_SESSION when it is void (mga#21454)
| -rw-r--r-- | usr/share/mageiawelcome/mageiawelcome.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index 4c7263e..5f14890 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -3,8 +3,6 @@ import signal import os import time -import urllib.request, urllib.parse, urllib.error -import subprocess import subprocess import shlex import gettext @@ -52,7 +50,10 @@ def main(): arch = '32-bit' home = os.getenv("HOME") username = os.getenv("USER") - desktop = get_desktop_name(os.path.basename(os.getenv("DESKTOP_SESSION"))) + if os.getenv("DESKTOP_SESSION") != "" : + desktop = get_desktop_name(os.path.basename(os.getenv("DESKTOP_SESSION"))) + else: + desktop = 'Other' if desktop == 'Other': desktop = get_desktop_name2(os.getenv("XDG_CURRENT_DESKTOP")) |