Ray Spear <[email protected]> reported that
f541fd43601f64205c990765db15870cdc86461c introduced a
regression when installing the autotest server from
scratch:

15:14:48 INFO | Setting autotest user password
15:14:48 INFO | Cloning autotest repo in /usr/local
15:14:48 INFO | Trying clone via git
fatal: destination path 'autotest' already exists and is not an empty
directory.

So, instead of just clone the tree using git clone, init
a git repo in there and fetch from upstream. Later on if
people want, we could make the tree/branch configurable.

Thanks to Ray for having reported the problem.

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
 contrib/install-autotest-server.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/install-autotest-server.sh 
b/contrib/install-autotest-server.sh
index e04cd25..61efaff 100755
--- a/contrib/install-autotest-server.sh
+++ b/contrib/install-autotest-server.sh
@@ -237,8 +237,10 @@ mkdir -p /usr/local
 if [ ! -e $ATHOME/.git/config ]
 then
     print_log "INFO" "Cloning autotest repo in $ATHOME"
-    cd /usr/local
-    git clone git://github.com/autotest/autotest.git
+    cd $ATHOME
+    git init
+    git fetch -f -u -t git://github.com/autotest/autotest.git master:master
+    git checkout master
 else
     print_log "INFO" "Updating autotest repo in $ATHOME"
     cd $ATHOME
-- 
1.7.10.1

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to