[Python-modules-commits] r16979 - in packages/pyxdg/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, May 8, 2011 @ 17:24:43
  Author: jwilk
Revision: 16979

Update fix-BaseDirectory-cornercase.patch to handle $XDG_*_DIRS variables.

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

Modified: packages/pyxdg/trunk/debian/changelog
===================================================================
--- packages/pyxdg/trunk/debian/changelog	2011-05-08 03:09:42 UTC (rev 16978)
+++ packages/pyxdg/trunk/debian/changelog	2011-05-08 17:24:43 UTC (rev 16979)
@@ -1,3 +1,10 @@
+pyxdg (0.19-3) UNRELEASED; urgency=low
+
+  * Update fix-BaseDirectory-cornercase.patch to handle $XDG_*_DIRS variables
+    (closes: #568757). Thanks to Thibaut Girka for the updated patch.
+
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 08 May 2011 19:21:43 +0200
+
 pyxdg (0.19-2) unstable; urgency=low
 
   * Fix case when $XDG_*_HOME is empty (fix-BaseDirectory-cornercase.patch)

Modified: packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch
===================================================================
--- packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch	2011-05-08 03:09:42 UTC (rev 16978)
+++ packages/pyxdg/trunk/debian/patches/fix-BaseDirectory-empty-vars.patch	2011-05-08 17:24:43 UTC (rev 16979)
@@ -1,10 +1,11 @@
-Author: Éric Araujo <merwok at netwok.org>,
+Author: Éric Araujo <merwok at netwok.org>, Thibaut Girka <thib at sitedethib.com>
 Description: Handle empty $XDG_*_HOME variables
 Bug-Debian: http://bugs.debian.org/568757
-Forwarded: yes
+Forwarded: no
+Last-Update: 2011-05-08
 
---- a/xdg/BaseDirectory.py	2010-02-07 16:35:38.000000000 +0100
-+++ b/xdg/BaseDirectory.py	2010-02-07 16:35:22.000000000 +0100
+--- a/xdg/BaseDirectory.py
++++ b/xdg/BaseDirectory.py
 @@ -28,21 +28,21 @@
  from __future__ import generators
  import os
@@ -17,7 +18,8 @@
 +            os.path.join(_home, '.local', 'share')
  
  xdg_data_dirs = [xdg_data_home] + \
-     os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
+-    os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
++    (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share').split(':')
  
 -xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
 -            os.path.join(_home, '.config'))
@@ -25,7 +27,8 @@
 +            os.path.join(_home, '.config')
  
  xdg_config_dirs = [xdg_config_home] + \
-     os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
+-    os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
++    (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg').split(':')
  
 -xdg_cache_home = os.environ.get('XDG_CACHE_HOME',
 -            os.path.join(_home, '.cache'))