changeset 6052:039a3f88518a

update-repoinfo: pass command line repository names to the database as unicode Fix bind SAWarning about not receiving unicode.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Jul 2016 16:28:34 +0200
parents 186bf5fee0a1
children c859ebb3243d
files kallithea/lib/paster_commands/update_repoinfo.py
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/paster_commands/update_repoinfo.py	Thu Jul 28 16:28:34 2016 +0200
+++ b/kallithea/lib/paster_commands/update_repoinfo.py	Thu Jul 28 16:28:34 2016 +0200
@@ -31,6 +31,7 @@
 import string
 
 from kallithea.lib.utils import BasePasterCommand
+from kallithea.lib.utils2 import safe_unicode
 from kallithea.model.db import Repository
 from kallithea.model.repo import RepoModel
 from kallithea.model.meta import Session
@@ -56,15 +57,14 @@
         #get SqlAlchemy session
         self._init_session()
 
-        repo_update_list = map(string.strip,
-                               self.options.repo_update_list.split(',')) \
-                               if self.options.repo_update_list else None
 
-        if repo_update_list is not None:
-            repo_list = list(Repository.query() \
-                .filter(Repository.repo_name.in_(repo_update_list)))
+        if self.options.repo_update_list is None:
+            repo_list = Repository.getAll()
         else:
-            repo_list = Repository.getAll()
+            repo_names = [safe_unicode(n.strip())
+                          for n in self.options.repo_update_list.split(',')]
+            repo_list = list(Repository.query()
+                .filter(Repository.repo_name.in_(repo_names)))
         RepoModel.update_repoinfo(repositories=repo_list)
         Session().commit()