[963] Minor whitespace fixes

diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in
index dc71b6b35c86f0c6cead4647fa7b99e0bc271dd4..85d043da6580c93224667d24827e73b98bc0372a 100755 (executable)
--- a/src/bin/dbutil/dbutil.py.in
+++ b/src/bin/dbutil/dbutil.py.in
@@ -78,7 +78,7 @@ upgrades = [
             # Move to the latest "V1" state of the database if not there
             # already.
             "CREATE TABLE IF NOT EXISTS diffs (" +
-                "id INTEGER PRIMARY KEY, " + 
+                "id INTEGER PRIMARY KEY, " +
                 "zone_id INTEGER NOT NULL," +
                 "version INTEGER NOT NULL, " +
                 "operation INTEGER NOT NULL, " +
@@ -419,7 +419,7 @@ def get_version(db):
 def match_version(db, expected):
     """
     @brief Check database version against that expected
-    
+
     Checks whether the version of the database matches that expected for
     the upgrade.  Both the major and minor versions must match.
 

diff --git a/src/bin/dbutil/tests/dbutil_test.sh.in b/src/bin/dbutil/tests/dbutil_test.sh.in
index 2b35c9f97c68b17b2d1e12b6655495df68319ada..ce469be67b41123500c0d300edb7924d05c3232c 100755 (executable)
--- a/src/bin/dbutil/tests/dbutil_test.sh.in
+++ b/src/bin/dbutil/tests/dbutil_test.sh.in
@@ -287,12 +287,12 @@ rm -f $tempfile $backupfile
 
 echo "3.1. Database is not an SQLite file - check"
 echo "This is not an sqlite3 database" > $tempfile
-../run_dbutil.sh --check $tempfile 
+../run_dbutil.sh --check $tempfile
 failzero $?
 check_no_backup $tempfile $backupfile
 
 echo "3.2. Database is not an SQLite file - upgrade"
-../run_dbutil.sh --upgrade --noconfirm $tempfile 
+../run_dbutil.sh --upgrade --noconfirm $tempfile
 failzero $?
 # ...and as before, a backup should have been created
 check_backup $tempfile $backupfile