Merge pull request #9 from SlapOS/remove-existing

Remove compile directory if it exists before downloading source

.gitignore

+dist
+*.pyc
+hexagonit.recipe.cmmi.egg-info
\ No newline at end of file

hexagonit/recipe/cmmi/__init__.py

@@ -128,14 +128,11 @@ class Recipe(object):
         # Download the source using hexagonit.recipe.download
         if self.options['url']:
             compile_dir = self.options['compile-directory']
-            try:
+            if os.path.exists(compile_dir):
+                # leftovers from a previous failed attempt, removing it.
+                log.warning('Removing already existing directory %s' % compile_dir)
+                shutil.rmtree(compile_dir)
             os.mkdir(compile_dir)
-            except OSError, e:
-                # leftovers from a previous failed attempt,
-                # download recipe will raise a clean error message
-                if e.errno != errno.EEXIST:
-                    raise
-
             try:
                 opt = self.options.copy()
                 opt['destination'] = compile_dir

hexagonit/recipe/cmmi/tests.py

@@ -116,10 +116,6 @@ class NonInformativeTests(unittest.TestCase):
             # expected failure
             self.assertRaises(zc.buildout.UserError, recipe.install)
 
-            # User deletes the __compile__ path
-            build_directory = os.path.join(self.dir, 'test_parts/test__compile__')
-            shutil.rmtree(build_directory)
-
             # the install should still fail, and _not_ raise an OSError
             self.assertRaises(zc.buildout.UserError, recipe.install)
         finally: