KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix parsing of password option; set timeout for writing.

Browse source 
SVN-Revision: 14046
This commit is contained in:
Jose Vasconcellos 2009-01-15 22:05:10 +00:00
parent 1b58d9c2f8
commit 435790e112
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/flashing/jungo-image.py
View file

@ -150,7 +150,7 @@ def usage():
try: try:
opts, args = getopt.getopt(sys.argv[1:], "hdf:u:qp:P:s:vVw", \ opts, args = getopt.getopt(sys.argv[1:], "hdf:u:qp:P:s:vVw", \
["help", "dump", "file=", "user=", "pass=", "proto=", "proto=", ["help", "dump", "file=", "user=", "pass=", "port=", "proto=",
"quiet=", "server=", "verbose", "version", "write"]) "quiet=", "server=", "verbose", "version", "write"])
except getopt.GetoptError: except getopt.GetoptError:
# print help information and exit: # print help information and exit:
@ -161,28 +161,28 @@ for o, a in opts:
if o in ("-h", "--help"): if o in ("-h", "--help"):
usage() usage()
sys.exit(1) sys.exit(1)
if o in ("-V", "--version"): elif o in ("-V", "--version"):
print "%s: 0.7" % sys.argv[0] print "%s: 0.8" % sys.argv[0]
sys.exit(1) sys.exit(1)
if o in ("-d", "--no-dump"): elif o in ("-d", "--no-dump"):
no_dump = 1 no_dump = 1
if o in ("-f", "--file"): elif o in ("-f", "--file"):
dumpfile = a dumpfile = a
if o in ("-s", "--server"): elif o in ("-s", "--server"):
server = a server = a
if o in ("-u", "--user"): elif o in ("-u", "--user"):
user = a user = a
if o in ("-p", "--pass"): elif o in ("-p", "--pass"):
password = a password = a
if o in ("-P", "--proto"): elif o in ("-P", "--proto"):
proto = a proto = a
if o in ("--port"): elif o == "--port":
PORT = a PORT = int(a)
if o in ("-w", "--write"): elif o in ("-w", "--write"):
write_image = 1 write_image = 1
if o in ("-q", "--quiet"): elif o in ("-q", "--quiet"):
verbose = 0 verbose = 0
if o in ("-v", "--verbose"): elif o in ("-v", "--verbose"):
verbose = 1 verbose = 1
# make sure we have enough arguments # make sure we have enough arguments
@ -252,7 +252,7 @@ if write_image:
print "Writing new image..." print "Writing new image..."
print cmd, print cmd,
tn.write(cmd) tn.write(cmd)
buf = tn.read_until("Returned 0") buf = tn.read_until("Returned 0",10)
tn.write("exit\n") tn.write("exit\n")
tn.close() tn.close()