[Fai-commit] r5361 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2009-04-19 17:13:03 +0000 (Sun, 19 Apr 2009)
New Revision: 5361

Modified:
   trunk/debian/changelog
   trunk/lib/get-config-dir-git
Log:
get-config-dir-git: do not clone into an existing directory (thanks
Sebastian Harl) (closes: #506463)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-19 17:11:13 UTC (rev 5360)
+++ trunk/debian/changelog	2009-04-19 17:13:03 UTC (rev 5361)
@@ -44,7 +44,9 @@
   * fai-chboot.8: fix description of -i
   * compat,rules: update to compat level 7
   * fai-mirror: set Dir::Etc option instead of changing
-    Dir::Etc::sourceslist only (thanks Sebastian Harl) (closes: #504813) 
+    Dir::Etc::sourceslist only (thanks Sebastian Harl) (closes: #504813)
+  * get-config-dir-git: do not clone into an existing directory (thanks
+    Sebastian Harl) (closes: #506463)
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4

Modified: trunk/lib/get-config-dir-git
===================================================================
--- trunk/lib/get-config-dir-git	2009-04-19 17:11:13 UTC (rev 5360)
+++ trunk/lib/get-config-dir-git	2009-04-19 17:13:03 UTC (rev 5361)
@@ -35,6 +35,8 @@
    task_error 701 $?
 else 
    echo "Checking out from git"
+   # cloning into an existing directory is not allowed
+   if [ -d $FAI ]; then rmdir $FAI; fi
    git clone $giturl $FAI 
    task_error 702 $?
 fi