Rev 6591: (vila) The XDG Base Directory Specification uses the XDG_CACHE_HOME, in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6591 [merge]
revision-id: pqm at pqm.ubuntu.com-20140212182222-beouo25gaf1cny76
parent: pqm at pqm.ubuntu.com-20140210100230-qwdxah7k01yaz51f
parent: a.starr.b at gmail.com-20140123190051-r14k1kregolynkn6
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2014-02-12 18:22:22 +0000
message:
  (vila) The XDG Base Directory Specification uses the XDG_CACHE_HOME,
   not XDG_CACHE_DIR. (Andrew Starr-Bochicchio)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2013-10-04 09:56:23 +0000
+++ b/bzrlib/config.py	2014-01-23 19:00:51 +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'
--- a/bzrlib/tests/test_config.py	2013-10-04 09:56:23 +0000
+++ b/bzrlib/tests/test_config.py	2014-01-23 19:00:51 +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')