From 5b7254af960e036446b05d38c3418dad893d140d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 6 Oct 2016 22:27:29 +0200 Subject: [PATCH] Minor patch --- lib/core/option.py | 4 ++++ lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index 0fd37e9a0..ae06fed52 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -2404,6 +2404,10 @@ def _basicOptionValidation(): errMsg = "switch '--text-only' is incompatible with switch '--null-connection'" raise SqlmapSyntaxException(errMsg) + if conf.eta and conf.verbose > defaults.verbose: + errMsg = "switch '--eta' is incompatible with option '-v'" + raise SqlmapSyntaxException(errMsg) + if conf.direct and conf.url: errMsg = "option '-d' is incompatible with option '-u' ('--url')" raise SqlmapSyntaxException(errMsg) diff --git a/lib/core/settings.py b/lib/core/settings.py index 8b92a9e75..47bbebd0e 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.10.16" +VERSION = "1.0.10.17" REVISION = getRevisionNumber() TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} diff --git a/txt/checksum.md5 b/txt/checksum.md5 index f3c03f1a2..35c32efff 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -39,13 +39,13 @@ e4aec2b11c1ad6039d0c3dbbfbc5eb1a lib/core/exception.py cc9c82cfffd8ee9b25ba3af6284f057e lib/core/__init__.py 91c514013daa796e2cdd940389354eac lib/core/log.py 5b079749c50240602ea92637e268ed31 lib/core/optiondict.py -ea77058a65b778110209995e3b864d54 lib/core/option.py +7e810ce6416465b3ccf0557f941a7653 lib/core/option.py 1e8948dddbd12def5c2af52530738059 lib/core/profiling.py e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -a3a07da9c74b3aa25aca23b00abfbe71 lib/core/settings.py +03d99f9c043a47cb17f5a7b1fe053422 lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py c3ace7874a536d801f308cf1fd03df99 lib/core/target.py