Add (forgotten in r11622) fix-BaseDirectory-empty-vars.patch.
Piotr Lewandowski
14 years ago
| 0 | Author: Éric Araujo <merwok@netwok.org>, | |
| 1 | Description: Handle empty $XDG_*_HOME variables | |
| 2 | Forwarded: yes | |
| 3 | ||
| 4 | --- a/xdg/BaseDirectory.py 2010-02-07 16:35:38.000000000 +0100 | |
| 5 | +++ b/xdg/BaseDirectory.py 2010-02-07 16:35:22.000000000 +0100 | |
| 6 | @@ -28,21 +28,21 @@ | |
| 7 | from __future__ import generators | |
| 8 | import os | |
| 9 | ||
| 10 | -_home = os.environ.get('HOME', '/') | |
| 11 | -xdg_data_home = os.environ.get('XDG_DATA_HOME', | |
| 12 | - os.path.join(_home, '.local', 'share')) | |
| 13 | +_home = os.path.expanduser('~') | |
| 14 | +xdg_data_home = os.environ.get('XDG_DATA_HOME') or \ | |
| 15 | + os.path.join(_home, '.local', 'share') | |
| 16 | ||
| 17 | xdg_data_dirs = [xdg_data_home] + \ | |
| 18 | os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':') | |
| 19 | ||
| 20 | -xdg_config_home = os.environ.get('XDG_CONFIG_HOME', | |
| 21 | - os.path.join(_home, '.config')) | |
| 22 | +xdg_config_home = os.environ.get('XDG_CONFIG_HOME') or \ | |
| 23 | + os.path.join(_home, '.config') | |
| 24 | ||
| 25 | xdg_config_dirs = [xdg_config_home] + \ | |
| 26 | os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':') | |
| 27 | ||
| 28 | -xdg_cache_home = os.environ.get('XDG_CACHE_HOME', | |
| 29 | - os.path.join(_home, '.cache')) | |
| 30 | +xdg_cache_home = os.environ.get('XDG_CACHE_HOME') or \ | |
| 31 | + os.path.join(_home, '.cache') | |
| 32 | ||
| 33 | xdg_data_dirs = filter(lambda x: x, xdg_data_dirs) | |
| 34 | xdg_config_dirs = filter(lambda x: x, xdg_config_dirs) |