Copy php application even if directory exists but is empty

cc3c4a0d · Cédric de Saint Martin · 14a83ba7 · cc3c4a0d
Commit cc3c4a0d authored Feb 08, 2013 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

slapos/recipe/apachephp/__init__.py slapos/recipe/apachephp/__init__.py +8 -4

No files found.
--- a/slapos/recipe/apachephp/__init__.py
+++ b/slapos/recipe/apachephp/__init__.py
@@ -40,10 +40,14 @@ class Recipe(GenericBaseRecipe):
  def install(self):
    path_list = []
-    # Copy application
+    # Copy application if not already existing
-    if not os.path.exists(self.options['htdocs']):
+    htdocs_location = self.options['htdocs']
-      shutil.copytree(self.options['source'],
+    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
-                      self.options['htdocs'])
+      try:
+        os.rmdir(htdocs_location)
+      except:
+        pass
+      shutil.copytree(self.options['source'], htdocs_location)
    # Install php.ini
    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],