[svn] commit: r2613 - in /branches/trac294/src: bin/cfgmgr/b10-cfgmgr.py.in lib/python/isc/config/cfgmgr.py

[BIND 10 source code commits]

Author: jelte
Date: Mon Aug  2 14:49:37 2010
New Revision: 2613

Log:
put [b10-cfgmgr] before error message
(removed from the one exception it was in, and moved to where it is actually printed)

Modified:
    branches/trac294/src/bin/cfgmgr/b10-cfgmgr.py.in
    branches/trac294/src/lib/python/isc/config/cfgmgr.py

Modified: branches/trac294/src/bin/cfgmgr/b10-cfgmgr.py.in
==============================================================================
--- branches/trac294/src/bin/cfgmgr/b10-cfgmgr.py.in (original)
+++ branches/trac294/src/bin/cfgmgr/b10-cfgmgr.py.in Mon Aug  2 14:49:37 2010
@@ -56,7 +56,7 @@
     except KeyboardInterrupt as kie:
         print("[b10-cfgmgr] Interrupted, exiting")
     except ConfigManagerDataReadError as cmdre:
-        print(str(cmdre))
+        print("[b10-cfgmgr] " + str(cmdre))
         return 2
     if cm:
         return cm.write_config()

Modified: branches/trac294/src/lib/python/isc/config/cfgmgr.py
==============================================================================
--- branches/trac294/src/lib/python/isc/config/cfgmgr.py (original)
+++ branches/trac294/src/lib/python/isc/config/cfgmgr.py Mon Aug  2 14:49:37 2010
@@ -78,7 +78,7 @@
                         config.data = file_config
                     else:
                         # We can put in a migration path here for old data
-                        raise ConfigManagerDataReadError("[b10-cfgmgr] Old version of data found")
+                        raise ConfigManagerDataReadError("Old version of data found")
                 else:
                     raise ConfigManagerDataReadError("No version information in configuration file " + config.db_filename)
             except: