Merge lp:~andrewsomething/bzr/lp1272042 into lp:bzr

Proposed by Andrew Starr-Bochicchio on 2014-01-23
Status: Merged
Approved by: Andrew Starr-Bochicchio on 2014-02-12
Approved revision: 6590
Merged at revision: 6591
Proposed branch: lp:~andrewsomething/bzr/lp1272042
Merge into: lp:bzr
Diff against target: 25 lines (+2/-2)
2 files modified
bzrlib/config.py (+1/-1)
bzrlib/tests/test_config.py (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/bzr/lp1272042
Reviewer Review Type Date Requested Status
Richard Wilbur 2014-01-23 Approve on 2014-01-24
Review via email: mp+202927@code.launchpad.net

Commit message

The XDG Base Directory Specification uses the XDG_CACHE_HOME, not XDG_CACHE_DIR.

To post a comment you must log in.
Richard Wilbur (richard-wilbur) wrote :

Thanks for catching this. I'm certainly in favour of standards compliance. Good work, Andrew!
+1

review: Approve

sent to pqm by email

Hmmm... Apparently my key isn't in the PQM keyring. Can someone land this?

Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/config.py'
--- bzrlib/config.py 2013-10-04 09:56:23 +0000
+++ bzrlib/config.py 2014-01-23 19:08:08 +0000
@@ -1557,7 +1557,7 @@
1557def xdg_cache_dir():1557def xdg_cache_dir():
1558 # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html1558 # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
1559 # Possibly this should be different on Windows?1559 # Possibly this should be different on Windows?
1560 e = os.environ.get('XDG_CACHE_DIR', None)1560 e = os.environ.get('XDG_CACHE_HOME', None)
1561 if e:1561 if e:
1562 return e1562 return e
1563 else:1563 else:
15641564
=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py 2013-10-04 09:56:23 +0000
+++ bzrlib/tests/test_config.py 2014-01-23 19:08:08 +0000
@@ -558,7 +558,7 @@
558 def setUp(self):558 def setUp(self):
559 super(TestConfigPath, self).setUp()559 super(TestConfigPath, self).setUp()
560 self.overrideEnv('HOME', '/home/bogus')560 self.overrideEnv('HOME', '/home/bogus')
561 self.overrideEnv('XDG_CACHE_DIR', '')561 self.overrideEnv('XDG_CACHE_HOME', '')
562 if sys.platform == 'win32':562 if sys.platform == 'win32':
563 self.overrideEnv(563 self.overrideEnv(
564 'BZR_HOME', r'C:\Documents and Settings\bogus\Application Data')564 'BZR_HOME', r'C:\Documents and Settings\bogus\Application Data')