# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2013-03-06 15:31:22
# Node ID 1b4fc33931d74839b611d021260395e5dbac82b5
# Parent  b39cb4d4e0bead38738dca04ae80afac45086018

fixed some unicode problems with archive downloads

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -447,7 +447,8 @@ class FilesController(BaseRepoController
                 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)
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1734,7 +1734,7 @@ class CacheInvalidation(Base, BaseModel)
             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()