From e9380627e1060eca9046193e682c0432bafe2009 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 10 Nov 2017 00:44:33 +0100 Subject: [PATCH] Better one for Issue #2769 --- lib/core/settings.py | 2 +- sqlmap.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 246017fbf..4026124fd 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.11.12" +VERSION = "1.1.11.13" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/sqlmap.py b/sqlmap.py index 996b96e00..8ea4135ad 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -262,7 +262,7 @@ def main(): logger.error(errMsg) raise SystemExit - elif "twophase" in excMsg: + elif all(_ in excMsg for _ in ("twophase", "sqlalchemy")): errMsg = "please update the 'sqlalchemy' package" errMsg += "(Reference: https://github.com/apache/incubator-superset/issues/3447)" logger.error(errMsg) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 295efdb9d..e11ef38f2 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -46,7 +46,7 @@ ec6a778b0e74749b916caead78ba88b7 lib/core/option.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -75b8d904c61a7d765082d68b320f30ef lib/core/settings.py +5868db3f5e8ba3be841fa74501e5bc60 lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py 7c9f2af3c0a8dd89223cfe07b0a0b826 lib/core/target.py @@ -224,7 +224,7 @@ c3cc8b7727161e64ab59f312c33b541a shell/stager.aspx_ 1f7f125f30e0e800beb21e2ebbab18e1 shell/stager.jsp_ 01e3505e796edf19aad6a996101c81c9 shell/stager.php_ c737efc0afe782c5dcfec9d27e827515 sqlmapapi.py -90c21cbd007b72eb8b840b11dcaf6f8c sqlmap.py +9103dbcc93b9d5854e2fd896e720e7b6 sqlmap.py ba9bb7b0fbfbd408c24bc99b3c8f0fd9 tamper/apostrophemask.py aa046ea026a3c72b714e726a2e775cd4 tamper/apostrophenullencode.py 0418d808878bf7cac4a28350116e64d0 tamper/appendnullbyte.py