Merge remote-tracking branch 'evol/master'

3 files changed, 15 insertions, 4 deletions

diff --git a/localserver/initdb.sh b/localserver/initdb.sh
index 9c81fed..417bc1a 100755
--- a/localserver/initdb.sh
+++ b/localserver/initdb.sh
@@ -22,5 +22,5 @@ $CMD <logs.sql
 
 if [[ -z "${VER}" ]]; then
     mkdir ${DIR}/versions
-    echo "10" >${DIR}/versions/sqlver
+    echo "11" >${DIR}/versions/sqlver
 fi
diff --git a/localserver/updatedb.sh b/localserver/updatedb.sh
index 0df8fd8..16080b7 100755
--- a/localserver/updatedb.sh
+++ b/localserver/updatedb.sh
@@ -54,6 +54,11 @@ if [ "${VER}" -lt "10" ]; then
     run "2017-11-04--10-39.sql"
 fi
 
-if [ "${VER}" -lt "10" ]; then
-    echo "10" >versions/sqlver
+if [ "${VER}" -lt "11" ]; then
+    run "2017-06-04--15-04.sql"
+    run "2017-06-04--15-05.sql"
+fi
+
+if [ "${VER}" -lt "11" ]; then
+    echo "11" >versions/sqlver
 fi
diff --git a/testxml/testxml.py b/testxml/testxml.py
index d62d1f4..c96b8a8 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -63,18 +63,24 @@ class Layer:
 
 def printErr(err):
     errDict.add(err)
-    print err
+    print err.encode("utf-8")
 
 def showFileErrorById(id, rootDir, fileDir):
+    rootDir = rootDir.encode("utf-8")
+    fileDir = fileDir.encode("utf-8")
     print "error: id=" + id + ", file not found: " + fileDir + " (" + rootDir + fileDir + ")"
 
 def showFileWarningById(id, rootDir, fileDir):
+    rootDir = rootDir.encode("utf-8")
+    fileDir = fileDir.encode("utf-8")
     print "warn: id=" + id + ", file not found: " + fileDir + " (" + rootDir + fileDir + ")"
 
 def showError(id, text):
+    text = text.encode("utf-8")
     print "error: id=" + id + " " + text
 
 def showWarning(id, text):
+    text = text.encode("utf-8")
     print "warn: id=" + id + " " + text
 
 def showMsg(id, text, src, iserr):