kallithea Changeset - 964aa663deca

Changeset - 964aa663deca

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Mads Kiilerich - 10 years ago 2016-01-05 16:24:27
madski@unity3d.com

repos: fix crashes when repository name is unicode and can't be encoded with the current LANG

2 files changed with 5 insertions and 5 deletions:

kallithea/model/db.py

kallithea/model/repo.py

0 comments (0 inline, 0 general)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1455,13 +1455,13 @@ class Repository(Base, BaseModel): @@
             log.debug('Getting scm_instance of %s from cache', rn)
         return _c(rn)
     def __get_instance(self):
         repo_full_path = self.repo_full_path
         alias = get_scm(repo_full_path)[0]
+        alias = get_scm(safe_str(repo_full_path))[0]
         log.debug('Creating instance of %s repository from %s',
                   alias, repo_full_path)
         backend = get_backend(alias)
         if alias == 'hg':
             repo = backend(safe_str(repo_full_path), create=False,

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -739,14 +739,14 @@ class RepoModel(BaseModel): @@
         :param old: old name
         :param new: new name
         """
         log.info('renaming repo from %s to %s', old, new)
         old_path = os.path.join(self.repos_path, old)
         new_path = os.path.join(self.repos_path, new)
         old_path = safe_str(os.path.join(self.repos_path, old))
         new_path = safe_str(os.path.join(self.repos_path, new))
         if os.path.isdir(new_path):
             raise Exception(
                 'Was trying to rename to already existing dir %s' % new_path
+            )
         shutil.move(old_path, new_path)
@@ @@ -755,17 +755,17 @@ class RepoModel(BaseModel): @@
         removes repo from filesystem, the removal is actually done by
         renaming dir to a 'rm__*' prefix which Kallithea will skip.
         It can be undeleted later by reverting the rename.
         :param repo: repo object
         """
         rm_path = os.path.join(self.repos_path, repo.repo_name)
+        rm_path = safe_str(os.path.join(self.repos_path, repo.repo_name))
         log.info("Removing %s", rm_path)
         _now = datetime.now()
         _ms = str(_now.microsecond).rjust(6, '0')
         _d = 'rm__%s__%s' % (_now.strftime('%Y%m%d_%H%M%S_' + _ms),
                              repo.just_name)
         if repo.group:
             args = repo.group.full_path_splitted + [_d]
             _d = os.path.join(*args)
         shutil.move(rm_path, os.path.join(self.repos_path, _d))
+        shutil.move(rm_path, safe_str(os.path.join(self.repos_path, _d)))

0 comments (0 inline, 0 general)