diff pylons_app/model/repo_model.py @ 382:b0715a788432

Added new style error display, fixed changing repo name to existing one some sa session remove added rename repo BIG bug, when renaming to existing name was fixed
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 24 Jul 2010 00:21:57 +0200
parents cec5cbc956c0
children a26f48ad7a8a
line wrap: on
line diff
--- a/pylons_app/model/repo_model.py	Wed Jul 21 22:57:36 2010 +0200
+++ b/pylons_app/model/repo_model.py	Sat Jul 24 00:21:57 2010 +0200
@@ -54,6 +54,7 @@
     def update(self, repo_id, form_data):
         try:
             if repo_id != form_data['repo_name']:
+                #rename our data
                 self.__rename_repo(repo_id, form_data['repo_name'])
             cur_repo = self.sa.query(Repository).get(repo_id)
             for k, v in form_data.items():
@@ -150,9 +151,13 @@
             MercurialRepository(repo_path, create=True)
 
     def __rename_repo(self, old, new):
-        log.info('renaming repoo from %s to %s', old, new)
+        log.info('renaming repo from %s to %s', old, new)
+        
         old_path = os.path.join(g.base_path, old)
         new_path = os.path.join(g.base_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)
     
     def __delete_repo(self, name):