kallithea Changeset - 9130fa3c6d61

Changeset - 9130fa3c6d61

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2012-01-04 02:12:30
marcin@python-works.com

fixes issue #331 RC mangles repository names if the a repository group contains the "full path" to the repositories

1 file changed with 2 insertions and 3 deletions:

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -153,26 +153,25 @@ def get_repos(path, recursive=False): @@
     Scans given path for repos and return (name,(type,path)) tuple
     :param path: path to scann for repositories
     :param recursive: recursive search and return names with subdirs in front
     """
     if path.endswith(os.sep):
         #remove ending slash for better results
-        path = path[:-1]
+    path = path.rstrip('/')
     def _get_repos(p):
         if not os.access(p, os.W_OK):
             return
         for dirpath in os.listdir(p):
             if os.path.isfile(os.path.join(p, dirpath)):
                 continue
             cur_path = os.path.join(p, dirpath)
             try:
                 scm_info = get_scm(cur_path)
                 yield scm_info[1].split(path)[-1].lstrip(os.sep), scm_info
+                yield scm_info[1].split(path, 1)[-1].lstrip(os.sep), scm_info
             except VCSError:
                 if not recursive:
                     continue
                 #check if this dir containts other repos for recursive scan
                 rec_path = os.path.join(p, dirpath)
                 if os.path.isdir(rec_path):

0 comments (0 inline, 0 general)