Fixes #3677

stamparm · stamparm · commit 9fd5fe732c91 · 2019-05-19T07:44:32.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.5.105"
+VERSION = "1.3.5.106"
 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
@@ -10,7 +10,6 @@
 import re
 import shutil
 import subprocess
-import sys
 import time
 import zipfile
 
@@ -29,7 +28,6 @@
 from lib.core.settings import IS_WIN
 from lib.core.settings import VERSION
 from lib.core.settings import ZIPBALL_PAGE
-from lib.core.settings import UNICODE_ENCODING
 from thirdparty.six.moves import urllib as _urllib
 
 def update():
@@ -108,11 +106,11 @@ def update():
         dataToStdout("\r[%s] [INFO] update in progress" % time.strftime("%X"))
 
         try:
-            process = subprocess.Popen("git checkout . && git pull %s HEAD" % GIT_REPOSITORY, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=paths.SQLMAP_ROOT_PATH.encode(sys.getfilesystemencoding() or UNICODE_ENCODING))
+            process = subprocess.Popen("git checkout . && git pull %s HEAD" % GIT_REPOSITORY, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=paths.SQLMAP_ROOT_PATH)
             pollProcess(process, True)
             output, _ = process.communicate()
             success = not process.returncode
-        except (IOError, OSError) as ex:
+        except Exception as ex:
             success = False
             output = getSafeExString(ex)
         finally:
