Merge lp:~ploum-deactivatedaccount/serpentine/xdg_folders into lp:serpentine

Proposed by Lionel Dricot
Status: Superseded
Proposed branch: lp:~ploum-deactivatedaccount/serpentine/xdg_folders
Merge into: lp:serpentine
Diff against target: None lines
To merge this branch: bzr merge lp:~ploum-deactivatedaccount/serpentine/xdg_folders
Reviewer Review Type Date Requested Status
Tiago Cogumbreiro Needs Resubmitting
Review via email: mp+9184@code.launchpad.net

This proposal has been superseded by a proposal from 2009-07-27.

To post a comment you must log in.
Revision history for this message
Lionel Dricot (ploum-deactivatedaccount) wrote :

This patch changes the config dir from .serpentine to $XDG_CONFIG_HOME.

As no critical informations are in the current .serpentine, there's no migration plan involved, I think it's a bit overkill to have a migration plan only for the playlist.xml.

Revision history for this message
Tiago Cogumbreiro (cogumbreiro) wrote :

> This patch changes the config dir from .serpentine to $XDG_CONFIG_HOME.
>
> As no critical informations are in the current .serpentine, there's no
> migration plan involved, I think it's a bit overkill to have a migration plan
> only for the playlist.xml.

In this project we try to make dependencies optional when feasible.

If the import of 'xdg.BaseDirectory' fails, then I would like the algorithm to fall back to the old method.

Could you do that?

review: Needs Resubmitting
165. By Lionel Dricot

xdg is now optionnal

166. By Lionel Dricot

oops, wrong folder

Unmerged revisions

166. By Lionel Dricot

oops, wrong folder

165. By Lionel Dricot

xdg is now optionnal

164. By Lionel Dricot

playlist are now in XDG folder

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serpentine/preferences.py'
2--- serpentine/preferences.py 2008-03-03 18:30:50 +0000
3+++ serpentine/preferences.py 2009-07-23 10:13:45 +0000
4@@ -25,6 +25,7 @@
5 from os import path
6 from types import StringType
7 from gettext import gettext as _
8+from xdg.BaseDirectory import xdg_data_home, xdg_config_home
9
10 # Local imports
11 import gaw
12@@ -312,7 +313,7 @@
13
14 ############
15 # configDir
16- __config_dir = path.join (path.expanduser ("~"), ".serpentine")
17+ __config_dir = path.join (xdg_config_home, "serpentine/")
18 def getConfigDir (self):
19 return self.__config_dir
20

Subscribers

No one subscribed via source and target branches