Revision c1f19851
b/lib/cli.py | ||
---|---|---|
2151 | 2151 |
""" |
2152 | 2152 |
# save the program name and the entire command line for later logging |
2153 | 2153 |
if sys.argv: |
2154 |
binary = os.path.basename(sys.argv[0]) or sys.argv[0] |
|
2154 |
binary = os.path.basename(sys.argv[0]) |
|
2155 |
if not binary: |
|
2156 |
binary = sys.argv[0] |
|
2157 |
|
|
2155 | 2158 |
if len(sys.argv) >= 2: |
2156 |
binary += " " + sys.argv[1] |
|
2157 |
old_cmdline = " ".join(sys.argv[2:]) |
|
2159 |
logname = utils.ShellQuoteArgs([binary, sys.argv[1]]) |
|
2158 | 2160 |
else: |
2159 |
old_cmdline = "" |
|
2161 |
logname = binary |
|
2162 |
|
|
2163 |
cmdline = utils.ShellQuoteArgs([binary] + sys.argv[1:]) |
|
2160 | 2164 |
else: |
2161 | 2165 |
binary = "<unknown program>" |
2162 |
old_cmdline = ""
|
|
2166 |
cmdline = "<unknown>"
|
|
2163 | 2167 |
|
2164 | 2168 |
if aliases is None: |
2165 | 2169 |
aliases = {} |
... | ... | |
2178 | 2182 |
for key, val in override.iteritems(): |
2179 | 2183 |
setattr(options, key, val) |
2180 | 2184 |
|
2181 |
utils.SetupLogging(constants.LOG_COMMANDS, binary, debug=options.debug,
|
|
2185 |
utils.SetupLogging(constants.LOG_COMMANDS, logname, debug=options.debug,
|
|
2182 | 2186 |
stderr_logging=True) |
2183 | 2187 |
|
2184 |
if old_cmdline: |
|
2185 |
logging.info("run with arguments '%s'", old_cmdline) |
|
2186 |
else: |
|
2187 |
logging.info("run with no arguments") |
|
2188 |
logging.info("Command line: %s", cmdline) |
|
2188 | 2189 |
|
2189 | 2190 |
try: |
2190 | 2191 |
result = func(options, args) |
Also available in: Unified diff