mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-10-31 16:07:55 +03:00 
			
		
		
		
	Fixes #2956
This commit is contained in:
		
							parent
							
								
									34d2fb1c8f
								
							
						
					
					
						commit
						a369f61207
					
				|  | @ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME | ||||||
| from lib.core.enums import OS | from lib.core.enums import OS | ||||||
| 
 | 
 | ||||||
| # sqlmap version (<major>.<minor>.<month>.<monthly commit>) | # sqlmap version (<major>.<minor>.<month>.<monthly commit>) | ||||||
| VERSION = "1.2.3.1" | VERSION = "1.2.3.2" | ||||||
| TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" | TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" | ||||||
| TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} | 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) | VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) | ||||||
|  |  | ||||||
|  | @ -20,6 +20,7 @@ from lib.core.data import paths | ||||||
| from lib.core.revision import getRevisionNumber | from lib.core.revision import getRevisionNumber | ||||||
| from lib.core.settings import GIT_REPOSITORY | from lib.core.settings import GIT_REPOSITORY | ||||||
| from lib.core.settings import IS_WIN | from lib.core.settings import IS_WIN | ||||||
|  | from lib.core.settings import UNICODE_ENCODING | ||||||
| 
 | 
 | ||||||
| def update(): | def update(): | ||||||
|     if not conf.updateAll: |     if not conf.updateAll: | ||||||
|  | @ -42,7 +43,7 @@ def update(): | ||||||
|         dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X")) |         dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X")) | ||||||
| 
 | 
 | ||||||
|         try: |         try: | ||||||
|             process = subprocess.Popen("git checkout . && git pull %s HEAD" % GIT_REPOSITORY, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=paths.SQLMAP_ROOT_PATH.encode(locale.getpreferredencoding()))  # Reference: http://blog.stastnarodina.com/honza-en/spot/python-unicodeencodeerror/ |             process = subprocess.Popen("git checkout . && git pull %s HEAD" % GIT_REPOSITORY, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=paths.SQLMAP_ROOT_PATH.encode(sys.getfilesystemencoding() or UNICODE_ENCODING)) | ||||||
|             pollProcess(process, True) |             pollProcess(process, True) | ||||||
|             stdout, stderr = process.communicate() |             stdout, stderr = process.communicate() | ||||||
|             success = not process.returncode |             success = not process.returncode | ||||||
|  |  | ||||||
|  | @ -46,14 +46,14 @@ ffa5f01f39b17c8d73423acca6cfe86a  lib/core/readlineng.py | ||||||
| 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py | 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py | ||||||
| a7db43859b61569b601b97f187dd31c5  lib/core/revision.py | a7db43859b61569b601b97f187dd31c5  lib/core/revision.py | ||||||
| fcb74fcc9577523524659ec49e2e964b  lib/core/session.py | fcb74fcc9577523524659ec49e2e964b  lib/core/session.py | ||||||
| 8f9ed47a90b8d4b1c11b7e94b3d2e75b  lib/core/settings.py | a78fff3d9089addb212c284c87baaad4  lib/core/settings.py | ||||||
| d0adc28a38e43a787df4471f7f027413  lib/core/shell.py | d0adc28a38e43a787df4471f7f027413  lib/core/shell.py | ||||||
| 63491be462c515a1a3880c27c2acc4a2  lib/core/subprocessng.py | 63491be462c515a1a3880c27c2acc4a2  lib/core/subprocessng.py | ||||||
| 505aaa61e1bba3c3d4567c3e667699e3  lib/core/target.py | 505aaa61e1bba3c3d4567c3e667699e3  lib/core/target.py | ||||||
| 72d499ca8d792e90a1ebfb2ad2341a51  lib/core/testing.py | 72d499ca8d792e90a1ebfb2ad2341a51  lib/core/testing.py | ||||||
| de9922a29c71a235cb95a916ff925db2  lib/core/threads.py | de9922a29c71a235cb95a916ff925db2  lib/core/threads.py | ||||||
| c40758411bb0bd68764d78e0bb72bd0f  lib/core/unescaper.py | c40758411bb0bd68764d78e0bb72bd0f  lib/core/unescaper.py | ||||||
| 1c2e5a9a34d4778c336a3d66d86ad000  lib/core/update.py | 755dc074f42ca8c73d1f2549a1cf09d1  lib/core/update.py | ||||||
| fc624104ddb36d41794b7a943fde5f21  lib/core/wordlist.py | fc624104ddb36d41794b7a943fde5f21  lib/core/wordlist.py | ||||||
| 1e5532ede194ac9c083891c2f02bca93  lib/__init__.py | 1e5532ede194ac9c083891c2f02bca93  lib/__init__.py | ||||||
| 7620f1f4b8791e13c7184c06b5421754  lib/parse/banner.py | 7620f1f4b8791e13c7184c06b5421754  lib/parse/banner.py | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user