Mercurial > kallithea

changeset 3488:1b4fc33931d7 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some unicode problems with archive downloads
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 06 Mar 2013 16:31:22 +0100
parents b39cb4d4e0be
children d997a314d18a
files rhodecode/controllers/files.py rhodecode/model/db.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/files.py	Wed Mar 06 16:20:28 2013 +0100
+++ b/rhodecode/controllers/files.py	Wed Mar 06 16:31:22 2013 +0100
@@ -447,7 +447,8 @@
                 yield data
 
         response.content_disposition = str('attachment; filename=%s-%s%s' \
-                                           % (repo_name, revision[:12], ext))
+                                           % (safe_str(repo_name),
+                                              safe_str(revision), ext))
         response.content_type = str(content_type)
         return get_chunked_archive(archive)
 
--- a/rhodecode/model/db.py	Wed Mar 06 16:20:28 2013 +0100
+++ b/rhodecode/model/db.py	Wed Mar 06 16:31:22 2013 +0100
@@ -1734,7 +1734,7 @@
             for inv_obj in inv_objs:
                 inv_obj.cache_active = False
                 log.debug('marking %s key for invalidation based on key=%s,repo_name=%s'
-                  % (inv_obj, key, repo_name))
+                  % (inv_obj, key, safe_str(repo_name)))
                 invalidated_keys.append(inv_obj.cache_key)
                 Session().add(inv_obj)
             Session().commit()