[Python-modules-commits] r11623 - in packages/pyxdg/trunk/debian/patches (1 file)

pl-guest at users.alioth.debian.org pl-guest at users.alioth.debian.org
Mon Feb 8 12:31:24 UTC 2010


    Date: Monday, February 8, 2010 @ 12:31:22
  Author: pl-guest
Revision: 11623

Add (forgotten in r11622) fix-BaseDirectory-empty-vars.patch.

Added:
  packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch

Added: packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch
===================================================================
--- packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch	                        (rev 0)
+++ packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch	2010-02-08 12:31:22 UTC (rev 11623)
@@ -0,0 +1,35 @@
+Author: Éric Araujo <merwok at netwok.org>,
+Description: Handle empty $XDG_*_HOME variables
+Forwarded: yes
+
+--- a/xdg/BaseDirectory.py	2010-02-07 16:35:38.000000000 +0100
++++ b/xdg/BaseDirectory.py	2010-02-07 16:35:22.000000000 +0100
+@@ -28,21 +28,21 @@
+ from __future__ import generators
+ import os
+ 
+-_home = os.environ.get('HOME', '/')
+-xdg_data_home = os.environ.get('XDG_DATA_HOME',
+-            os.path.join(_home, '.local', 'share'))
++_home = os.path.expanduser('~')
++xdg_data_home = os.environ.get('XDG_DATA_HOME') or \
++            os.path.join(_home, '.local', 'share')
+ 
+ xdg_data_dirs = [xdg_data_home] + \
+     os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
+ 
+-xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
+-            os.path.join(_home, '.config'))
++xdg_config_home = os.environ.get('XDG_CONFIG_HOME') or \
++            os.path.join(_home, '.config')
+ 
+ xdg_config_dirs = [xdg_config_home] + \
+     os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
+ 
+-xdg_cache_home = os.environ.get('XDG_CACHE_HOME',
+-            os.path.join(_home, '.cache'))
++xdg_cache_home = os.environ.get('XDG_CACHE_HOME') or \
++            os.path.join(_home, '.cache')
+ 
+ xdg_data_dirs = filter(lambda x: x, xdg_data_dirs)
+ xdg_config_dirs = filter(lambda x: x, xdg_config_dirs)




More information about the Python-modules-commits mailing list