[game-data-packager] 01/01: scummvm now follows XDG Base Directory Specification

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit d49d698d26375a1c5e5a8aaf027a69748df6e29c
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Feb 2 09:27:14 2016 +0100

    scummvm now follows XDG Base Directory Specification
---
 game_data_packager/games/scummvm_common.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index 05e0ac5..ab4234c 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -71,8 +71,14 @@ class ScummvmTask(PackagingTask):
             return
 
         # http://wiki.scummvm.org/index.php/User_Manual/Configuring_ScummVM
-        rcfile = os.path.expanduser('~/.scummvmrc')
-        if not os.path.isfile(rcfile):
+        # https://github.com/scummvm/scummvm/pull/656
+        for rcfile in (os.path.join(os.environ.get('XDG_DATA_HOME',
+                                    os.path.expanduser('~/.local/share')),
+                                              'scummvm/scummvm.ini'),
+                       os.path.expanduser('~/.scummvmrc')):
+            if os.path.isfile(rcfile):
+                break
+        else:
             return
 
         config = configparser.ConfigParser(strict=False)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git