]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
fixed kea-admin dscsql lease-init script
authorRazvan Becheriu <razvan.becheriu@qualitance.com>
Mon, 30 May 2016 10:40:40 +0000 (13:40 +0300)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 23 Jun 2016 12:22:00 +0000 (14:22 +0200)
src/bin/admin/kea-admin.in

index 8e74be3f840950dd8cc7f791a4c9c12e33385a17..0323fb635e0ea208875025d4d78564a541d21cae 100644 (file)
@@ -217,11 +217,11 @@ dscsql_init() {
         exit 1
     fi
 
-    COUNT=`echo $RESULT | grep $db_name | wc -w`
+    COUNT=`echo $RESULT | tr " " "\n" | grep $db_name | wc -w`
     if [ $COUNT -gt 0 ]; then
         # Let't start with a new line. cqlsh could have printed something out.
         printf "\n"
-        log_error "Expected empty database $db_name, but there are $COUNT tables: \n$RESULT. Aborting."
+        log_error "Expected no database $db_name, but there are $COUNT databases: \n$RESULT. Aborting."
         exit 1
     fi