git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.planet-lab.org/monitor
[monitor.git]
/
monitor
/
parser.py
diff --git
a/monitor/parser.py
b/monitor/parser.py
index
ac26cd6
..
b6ae032
100644
(file)
--- a/
monitor/parser.py
+++ b/
monitor/parser.py
@@
-28,7
+28,7
@@
def parseSetDefaults(parser=None):
parser.set_defaults(debug = config.debug,
mail = config.mail,
bcc = config.bcc,
parser.set_defaults(debug = config.debug,
mail = config.mail,
bcc = config.bcc,
- email = config.email,
+ email = config.
from_
email,
run = config.run,
squeeze = config.squeeze,
policysavedb = config.policysavedb)
run = config.run,
squeeze = config.squeeze,
policysavedb = config.policysavedb)
@@
-117,7
+117,7
@@
def getParser(parsesets=[], parser=None):
p = parseSetDefaults(p)
return p
p = parseSetDefaults(p)
return p
-
+
def parse_args(parser):
class obj: pass
(options, args) = parser.parse_args()
def parse_args(parser):
class obj: pass
(options, args) = parser.parse_args()
@@
-133,7
+133,7
@@
def print_values(parser):
for key in parser.__dict__.keys():
if key not in exclude:
print "%20s == %s" % (key, parser.__dict__[key])
for key in parser.__dict__.keys():
if key not in exclude:
print "%20s == %s" % (key, parser.__dict__[key])
-
+
def usage(parser):
print_values(parser)
parser.print_help()
def usage(parser):
print_values(parser)
parser.print_help()