Rev 1693: Properly encode cache file path. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Mon Sep 1 03:22:51 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1693
revision-id: jelmer at samba.org-20080901022247-3gfm3hutu2tiu8kf
parent: jelmer at samba.org-20080831231630-2ofs47zet20wdhkc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-09-01 04:22:47 +0200
message:
  Properly encode cache file path.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'NEWS'
--- a/NEWS	2008-08-31 23:16:30 +0000
+++ b/NEWS	2008-09-01 02:22:47 +0000
@@ -26,6 +26,9 @@
 
    * Fix pull into Subversion working copies.
 
+   * Properly encode cache file path in case it contains non-ascii 
+     characters. (#262923)
+
   FEATURES
 
    * Use native Windows password prompter on Windows. (#263287)

=== modified file 'repository.py'
--- a/repository.py	2008-08-27 17:39:12 +0000
+++ b/repository.py	2008-09-01 02:22:47 +0000
@@ -202,7 +202,7 @@
             cache_dir = self.create_cache_dir()
             cache_file = os.path.join(cache_dir, 'cache-v%d' % CACHE_DB_VERSION)
             if not cachedbs.has_key(cache_file):
-                cachedbs[cache_file] = sqlite3.connect(cache_file)
+                cachedbs[cache_file] = sqlite3.connect(cache_file.encode(osutils._fs_enc))
             self.cachedb = cachedbs[cache_file]
             self._log = logwalker.CachingLogWalker(self._log, cache_db=self.cachedb)
             cachedir_transport = get_transport(cache_dir)




More information about the bazaar-commits mailing list