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

[Andrew Starr-Bochicchio]

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

[Richard Wilbur (richard-wilbur)]

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

review: Approve

[Andrew Starr-Bochicchio (andrewsomething)]

sent to pqm by email

[Andrew Starr-Bochicchio (andrewsomething)]

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

[Vincent Ladeuil (vila)]

sent to pqm by email

=== 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 @@
 def xdg_cache_dir():
     # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html
     # Possibly this should be different on Windows?
-    e = os.environ.get('XDG_CACHE_DIR', None)
+    e = os.environ.get('XDG_CACHE_HOME', None)
     if e:
         return e
     else:

=== 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 @@
     def setUp(self):
         super(TestConfigPath, self).setUp()
         self.overrideEnv('HOME', '/home/bogus')
-        self.overrideEnv('XDG_CACHE_DIR', '')
+        self.overrideEnv('XDG_CACHE_HOME', '')
         if sys.platform == 'win32':
             self.overrideEnv(
                 'BZR_HOME', r'C:\Documents and Settings\bogus\Application Data')