From 84eb694361a4f3a6371dc4031dade1c4e0ed989a Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Sat, 7 Jul 2012 20:53:51 +0100 Subject: [PATCH 1/2] fixed exception message (Subversion to github) --- lib/core/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 7d10017df..110982902 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -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 " From ddf87aec3857dd9f0667501f9bf180013cafc81a Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Sat, 7 Jul 2012 21:34:31 +0100 Subject: [PATCH 2/2] Fix for Issue #71 --- lib/techniques/error/use.py | 2 +- lib/techniques/union/use.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index 93863c813..0beb7d68d 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -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 diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py index ddc85bf17..f3a9227c5 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -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]