diff --git a/extra/shutils/regressiontest.py b/extra/shutils/regressiontest.py index d5379405e..5d43584a9 100644 --- a/extra/shutils/regressiontest.py +++ b/extra/shutils/regressiontest.py @@ -22,7 +22,6 @@ from lib.core.revision import getRevisionNumber START_TIME = time.strftime("%H:%M:%S %d-%m-%Y", time.gmtime()) SQLMAP_HOME = "/opt/sqlmap" -REVISION = getRevisionNumber() SMTP_SERVER = "127.0.0.1" SMTP_PORT = 25 @@ -30,7 +29,7 @@ SMTP_TIMEOUT = 30 FROM = "regressiontest@sqlmap.org" #TO = "dev@sqlmap.org" TO = ["bernardo.damele@gmail.com", "miroslav.stampar@gmail.com"] -SUBJECT = "regression test started on %s using revision %s" % (START_TIME, REVISION) +SUBJECT = "regression test started on %s using revision %s" % (START_TIME, getRevisionNumber()) TARGET = "debian" def prepare_email(content): diff --git a/lib/core/settings.py b/lib/core/settings.py index 089e6db27..cf1bcf0dd 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -17,11 +17,9 @@ from lib.core.datatype import AttribDict from lib.core.enums import DBMS from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS -from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.10.21" -REVISION = getRevisionNumber() +VERSION = "1.0.10.22" 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/lib/core/update.py b/lib/core/update.py index c88ae74a6..a1c92232f 100644 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -53,9 +53,7 @@ def update(): stderr = getSafeExString(ex) if success: - import lib.core.settings - _ = lib.core.settings.REVISION = getRevisionNumber() - logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", _)) + logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", getRevisionNumber())) else: if "Not a git repository" in stderr: errMsg = "not a valid git repository. Please checkout the 'sqlmapproject/sqlmap' repository " diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 6c88d7fe9..cbd5b6d38 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -16,7 +16,7 @@ d229479d02d21b29f209143cb0547780 extra/shellcodeexec/linux/shellcodeexec.x32_ c55b400b72acc43e0e59c87dd8bb8d75 extra/shellcodeexec/windows/shellcodeexec.x32.exe_ b46521e29ea3d813bab5aeb16cac6498 extra/shutils/duplicates.py 4bf52b3fd5e906b9bbe104dda769f5c5 extra/shutils/pylint.py -05615626222060120450518136b14ba9 extra/shutils/regressiontest.py +a8dd1f5799ed863a80b94c36b5428528 extra/shutils/regressiontest.py cc9c82cfffd8ee9b25ba3af6284f057e extra/sqlharvest/__init__.py 4f2f817596540d82f9fcc0c5b2228beb extra/sqlharvest/sqlharvest.py 2daa39e4d59526acb4772b6c47eb315f lib/controller/action.py @@ -45,14 +45,14 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py 5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py 99a2b496b9d5b546b335653ca801153f lib/core/revision.py 7c15dd2777af4dac2c89cab6df17462e lib/core/session.py -5a6d84960ff31279407075c65fc09d7f lib/core/settings.py +a9bda44aa2a28b50254faadb508a6539 lib/core/settings.py 7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py 23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py c3ace7874a536d801f308cf1fd03df99 lib/core/target.py d43f059747ffd48952922c94152e2a07 lib/core/testing.py 2cafee22d9f8018e7efff0a5e3178596 lib/core/threads.py 53c15b78e0288274f52410db25406432 lib/core/unescaper.py -6bdc53e2ca152ff8cd35ad671e48a96b lib/core/update.py +60100cb265ae8bb903b760c7b7a3a7f3 lib/core/update.py 8485a3cd94c0a5af2718bad60c5f1ae5 lib/core/wordlist.py cc9c82cfffd8ee9b25ba3af6284f057e lib/__init__.py c1288bc4ce5651dbdd82d4a9435fdc03 lib/parse/banner.py