git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- changed gpg_verify() calling convention
[plcapi.git]
/
plcsh
diff --git
a/plcsh
b/plcsh
index
c7b620e
..
605877c
100755
(executable)
--- a/
plcsh
+++ b/
plcsh
@@
-5,12
+5,13
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
-# $Id: plcsh,v 1.
1 2007/01/08 18:23:14
mlhuang Exp $
+# $Id: plcsh,v 1.
3 2007/01/11 20:45:29
mlhuang Exp $
#
import os
import sys
from optparse import OptionParser
#
import os
import sys
from optparse import OptionParser
+from getpass import getpass
from traceback import print_exc
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
from traceback import print_exc
sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
@@
-31,7
+32,7
@@
parser.add_option("--help", action = "help", help = "show this help message and
# If user is specified but password is not
if options.user is not None and options.password is None:
try:
# If user is specified but password is not
if options.user is not None and options.password is None:
try:
- options.password = getpass
.getpass
()
+ options.password = getpass()
except (EOFError, KeyboardInterrupt):
print
sys.exit(0)
except (EOFError, KeyboardInterrupt):
print
sys.exit(0)
@@
-47,7
+48,7
@@
try:
# Register a few more globals for backward compatibility
auth = shell.auth
api = shell.api
# Register a few more globals for backward compatibility
auth = shell.auth
api = shell.api
- config =
api
.config
+ config =
shell
.config
except Exception, err:
print "Error:", err
print
except Exception, err:
print "Error:", err
print