[svn] commit: r1647 - /trunk/src/bin/cmdctl/cmdctl.py.in

[BIND 10 source code commits]

Author: jelte
Date: Thu Mar 25 12:50:13 2010
New Revision: 1647

Log:
some very minor issues that came up during review of cmdctl

Modified:
    trunk/src/bin/cmdctl/cmdctl.py.in

Modified: trunk/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- trunk/src/bin/cmdctl/cmdctl.py.in (original)
+++ trunk/src/bin/cmdctl/cmdctl.py.in Thu Mar 25 12:50:13 2010
@@ -62,10 +62,10 @@
     DATAROOTDIR = "@datarootdir@"
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
     SYSCONF_PATH = "@sysconfdir@/@PACKAGE@".replace("${prefix}", PREFIX)
-SPECFILE_LOCATION = SPECFILE_PATH + "/cmdctl.spec"
-USER_INFO_FILE = SYSCONF_PATH + "/cmdctl-accounts.csv"
-PRIVATE_KEY_FILE = SYSCONF_PATH + "/cmdctl-keyfile.pem"
-CERTIFICATE_FILE = SYSCONF_PATH + "/cmdctl-certfile.pem"
+SPECFILE_LOCATION = SPECFILE_PATH + os.sep + "cmdctl.spec"
+USER_INFO_FILE = SYSCONF_PATH + os.sep + "cmdctl-accounts.csv"
+PRIVATE_KEY_FILE = SYSCONF_PATH + os.sep + "cmdctl-keyfile.pem"
+CERTIFICATE_FILE = SYSCONF_PATH + os.sep + "cmdctl-certfile.pem"
         
 class SecureHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
     '''https connection request handler.
@@ -257,7 +257,7 @@
                 self.command_spec[arg[0]] = arg[1]
             elif command == isc.config.ccsession.COMMAND_SPECIFICATION_UPDATE:
                 self.config_spec[arg[0]] = arg[1]
-            elif command == "shutdown":
+            elif command == isc.config.ccsession.COMMAND_SHUTDOWN:
                 return False
             (message, env) = self.cc.group_recvmsg(True)
             command, arg = isc.config.ccsession.parse_command(message)