← Back to branch summary

~ubuntu-branches/ubuntu/precise/pyxdg/precise

« back to all changes in this revision

Viewing changes to debian/patches/fix-BaseDirectory-empty-vars.patch

  • Committer: Barry Warsaw
  • Date: 2011-08-08 22:32:01 UTC
  • mfrom: (3.1.6 sid)
  • Revision ID: barry@python.org-20110808223201-nhsgno3tdrjuokar
http://bugs.debian.org/568757
* Team upload.
* Update fix-BaseDirectory-cornercase.patch to handle $XDG_*_DIRS variables
  (closes: #568757). Thanks to Thibaut Girka for the updated patch.
* Bump standards version to 3.9.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-BaseDirectory-empty-vars.patch
1
 
Author: Éric Araujo <merwok@netwok.org>,
 
1
Author: Éric Araujo <merwok@netwok.org>, Thibaut Girka <thib@sitedethib.com>
2
2
Description: Handle empty $XDG_*_HOME variables
3
3
Bug-Debian: http://bugs.debian.org/568757
4
 
Forwarded: yes
 
4
Forwarded: no
 
5
Last-Update: 2011-05-08
5
6
 
6
 
--- a/xdg/BaseDirectory.py      2010-02-07 16:35:38.000000000 +0100
7
 
+++ b/xdg/BaseDirectory.py      2010-02-07 16:35:22.000000000 +0100
 
7
--- a/xdg/BaseDirectory.py
 
8
+++ b/xdg/BaseDirectory.py
8
9
@@ -28,21 +28,21 @@
9
10
 from __future__ import generators
10
11
 import os
17
18
+            os.path.join(_home, '.local', 'share')
18
19
 
19
20
 xdg_data_dirs = [xdg_data_home] + \
20
 
     os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
 
21
-    os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
 
22
+    (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share').split(':')
21
23
 
22
24
-xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
23
25
-            os.path.join(_home, '.config'))
25
27
+            os.path.join(_home, '.config')
26
28
 
27
29
 xdg_config_dirs = [xdg_config_home] + \
28
 
     os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
 
30
-    os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
 
31
+    (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg').split(':')
29
32
 
30
33
-xdg_cache_home = os.environ.get('XDG_CACHE_HOME',
31
34
-            os.path.join(_home, '.cache'))