kallithea Changeset - ce8572f45c85

Changeset - ce8572f45c85

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-10-11 20:31:37
marcin@python-works.com

use normpath when comparing paths used to determine if directory is a symlink, it's a part of pull-request #77

1 file changed with 2 insertions and 2 deletions:

rhodecode/lib/db_manage.py

0 comments (0 inline, 0 general)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -534,27 +534,27 @@ class DbManage(object): @@
         # check write access
         elif not os.access(path, os.W_OK) and path_ok:
             path_ok = False
             log.error('No write permission to given path %s' % path)
         if retries == 0:
             sys.exit('max retries reached')
         if path_ok is False:
             retries -= 1
             return self.config_prompt(test_repo_path, retries)
         real_path = os.path.realpath(path)
+        real_path = os.path.normpath(os.path.realpath(path))
         if real_path != path:
+        if real_path != os.path.normpath(path):
             if not ask_ok(('Path looks like a symlink, Rhodecode will store '
                            'given path as %s ? [y/n]') % (real_path)):
                 log.error('Canceled by user')
                 sys.exit(-1)
         return real_path
     def create_settings(self, path):
         self.create_ui_settings()
         #HG UI OPTIONS

0 comments (0 inline, 0 general)