Index: tools/check-batch-cmd
===================================================================
--- tools/check-batch-cmd	(revision 10097)
+++ tools/check-batch-cmd	(revision 10098)
@@ -8,4 +8,5 @@
 import argparse
 import gformat
+import getpass
 import netsnmp
 import os
@@ -15,9 +16,5 @@
 import time
 
-try:
-  SSHPASS = os.environ['SSHPASS']
-except KeyError:
-  SSHPASS = 'SSH_NOT_SET'
-
+SSHPASS = None
 netsnmp.verbose = 0
 
@@ -49,5 +46,5 @@
   retval = sess.get(var_list)
   if sess.ErrorInd < 0:
-    raise CmdError('[%(ErrorInd)s] %(ErrorStr)s (%(DestHost)s)' % vars(sess))
+    raise CmdError('SNMP Failed -- [%(ErrorInd)s] %(ErrorStr)s (%(DestHost)s)' % vars(sess))
   return filter(None, retval)[0]
 
@@ -125,5 +122,5 @@
   # create the top-level parser
   parser = argparse.ArgumentParser(prog='Various WL management tools')
-  #parser.add_argument('--foo', action='store_true', help='foo help')
+  parser.add_argument('--ask-pass', dest="ask_pass", action='store_true', help='Ask password if SSHPASS is not found')
   subparsers = parser.add_subparsers(help='sub-command help')
   
@@ -142,4 +139,12 @@
   args = parser.parse_args()
 
+  try:
+    SSHPASS = os.environ['SSHPASS']
+  except KeyError:
+    print "#WARN: SSHPASS environ variable not found"
+    if args.ask_pass:
+      SSHPASS = getpass.getpass("WL root password: ")
+
+
   if args.func == 'keys':
     ubnt_keys(args.host)