[Fai-commit] r6517 - trunk/lib

[Michael Tautschnig]

Author: mt
Date: 2011-05-01 23:16:03 +0000 (Sun, 01 May 2011)
New Revision: 6517

Modified:
   trunk/lib/get-config-dir-svn
Log:
get-config-dir-svn: Fix broken-pipe error in SVN URL check


Modified: trunk/lib/get-config-dir-svn
===================================================================
--- trunk/lib/get-config-dir-svn	2011-04-28 14:06:20 UTC (rev 6516)
+++ trunk/lib/get-config-dir-svn	2011-05-01 23:16:03 UTC (rev 6517)
@@ -53,14 +53,14 @@
 [ -n "$username" ] && user="--username $username"
 
 if [ -d "$FAI/.svn" ] ; then
-    if [ `svn info $FAI | egrep -m1 -o '://.+'` == "://$svnpath" ]; then
+    if [ `svn info $FAI | grep '^URL:' | egrep -o '://.+'` == "://$svnpath" ]; then
         echo "Updating SVN in $FAI"
         cd $FAI
         svn up $user $pass | grep -v 'Updated to revision' > $LOGDIR/getconf.log
         task_error 701 ${PIPESTATUS[0]}
     else
         echo "$FAI already contains a svn repository, but it is not from $svnurl!" >&2
-        echo "Please delete $FAI manually. Aborting..." >&2
+        echo "Please delete $FAI manually. Fatal error." >&2
         task_error 703
     fi
 else