This commit is contained in:
GitHub Merge Button 2012-07-07 13:29:40 -07:00
commit 825e5f6075
3 changed files with 4 additions and 4 deletions

View File

@ -2479,8 +2479,8 @@ def unhandledExceptionMessage():
"""
errMsg = "unhandled exception in %s, retry your " % VERSION_STRING
errMsg += "run with the latest development version from the Subversion "
errMsg += "repository. If the exception persists, please send by e-mail "
errMsg += "run with the latest development version from github."
errMsg += "If the exception persists, please send by e-mail "
errMsg += "to '%s' or open a new issue at '%s' with the following text " % (ML, ISSUES_PAGE)
errMsg += "and any information required to reproduce the bug. The "
errMsg += "developers will try to reproduce the bug, fix it accordingly "

View File

@ -177,7 +177,7 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N
if kb.fileReadMode and output and output.strip():
print
elif output is not None and not (threadData.resumed and kb.suppressResumeInfo):
dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output)))
dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output)))
if isinstance(num, int):
expression = origExpr

View File

@ -317,7 +317,7 @@ def unionUse(expression, unpack=True, dump=False):
items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter)
if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo):
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items)))))
status = "[%s] [INFO] %s #%d: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items)))))
if len(status) > width:
status = "%s..." % status[:width - 3]