From 18042a47533eda28f698d21a12b975e3f583df36 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 27 2015 15:17:01 +0000 Subject: Rename the variables to not overlap and clean what's created if one step fails --- diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py index 755b0e4..f26ba91 100644 --- a/progit/lib/__init__.py +++ b/progit/lib/__init__.py @@ -369,19 +369,22 @@ def new_project(session, user, name, gitfolder, docfolder, ticketfolder, pygit2.init_repository(gitrepo, bare=True) - gitrepo = os.path.join(docfolder, project.path) - if os.path.exists(gitrepo): + docrepo = os.path.join(docfolder, project.path) + if os.path.exists(docrepo): + shutil.rmtree(gitrepo) raise progit.exceptions.RepoExistsException( 'The docs repo "%s" already exists' % project.path ) - pygit2.init_repository(gitrepo, bare=True) + pygit2.init_repository(docrepo, bare=True) - gitrepo = os.path.join(ticketfolder, project.path) - if os.path.exists(gitrepo): + ticketrepo = os.path.join(ticketfolder, project.path) + if os.path.exists(ticketrepo): + shutil.rmtree(gitrepo) + shutil.rmtree(docrepo) raise progit.exceptions.RepoExistsException( 'The tickets repo "%s" already exists' % project.path ) - pygit2.init_repository(gitrepo, bare=True) + pygit2.init_repository(ticketrepo, bare=True) return 'Project "%s" created' % name