[svn] commit: r2189 - in /branches/tingting-loadzone/src/bin/loadzone: b10-loadzone.py.in tests/error/error.known

[BIND 10 source code commits]

Author: shentingting
Date: Mon Jun 21 03:13:39 2010
New Revision: 2189

Log:
modifying the code after shane reviewed, I corrected some spelling mistakes and changed threading stuff to print periodically

Modified:
    branches/tingting-loadzone/src/bin/loadzone/b10-loadzone.py.in
    branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known

Modified: branches/tingting-loadzone/src/bin/loadzone/b10-loadzone.py.in
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/b10-loadzone.py.in (original)
+++ branches/tingting-loadzone/src/bin/loadzone/b10-loadzone.py.in Mon Jun 21 03:13:39 2010
@@ -59,7 +59,6 @@
         usage()
     zonefile = args[0]
     verbose = os.isatty(sys.stdout.fileno())
-
     try:
         master = MasterFile(zonefile, initial_origin, verbose)
     except Exception as e:
@@ -71,8 +70,7 @@
         if verbose:
             sys.stdout.write("Using SQLite3 database file %s\n" % dbfile)
             sys.stdout.write("Zone name is %s\n" % zone)
-            sys.stdout.write("Loading file \"%s\"" % zonefile)
-            master.verbose()
+            sys.stdout.write("Loading file \"%s\"\n" % zonefile)
     except Exception as e:
         sys.stdout.write("\n")
         sys.stderr.write("Error reading zone file: %s\n" % str(e))
@@ -82,7 +80,7 @@
         isc.datasrc.sqlite3_ds.load(dbfile, zone, master.zonedata)
         if verbose:
             master.closeverbose()
-            sys.stdout.write("\nCommitting changes... done.\n")
+            sys.stdout.write("\nDone.\n")
     except Exception as e:
         sys.stdout.write("\n")
         sys.stderr.write("Error loading database: %s\n"% str(e))

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known Mon Jun 21 03:13:39 2010
@@ -3,9 +3,9 @@
 Error reading zone file: Cannot parse RR: $TL 300
 Error reading zone file: Cannot parse RR: $OIGIN com.
 Error loading database: Error while loading com.: Cannot parse RR: $INLUDE file.txt
-Error loading database: Error while loading com.: Invalid $include formal
-Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN: $INCLUDE include.txt sub
+Error loading database: Error while loading com.: Invalid $include format
+Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN:  include.txt sub
 Error reading zone file: Invalid TTL: ""
 Error reading zone file: Invalid TTL: "M"
 Error loading database: Error while loading com.: Cannot parse RR: b "no type error!"
-Error reading zone file: [Errno 2] No such file or directory: 'bogusfile'
+Error reading zone file: Could not open bogusfile