mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-12-06 20:51:31 +00:00
Another update for Issue #52
This commit is contained in:
@@ -71,7 +71,7 @@ def setNonBlocking(fd):
|
||||
flags = flags | os.O_NONBLOCK
|
||||
fcntl.fcntl(fd, FCNTL.F_SETFL, flags)
|
||||
|
||||
def pollProcess(process):
|
||||
def pollProcess(process, suppress_errors=False):
|
||||
while True:
|
||||
dataToStdout(".")
|
||||
time.sleep(1)
|
||||
@@ -79,6 +79,7 @@ def pollProcess(process):
|
||||
returncode = process.poll()
|
||||
|
||||
if returncode is not None:
|
||||
if not suppress_errors:
|
||||
if returncode == 0:
|
||||
dataToStdout(" done\n")
|
||||
elif returncode < 0:
|
||||
|
||||
@@ -35,15 +35,21 @@ def update():
|
||||
logger.debug(debugMsg)
|
||||
|
||||
dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X"))
|
||||
process = execute("git pull %s" % rootDir, shell=True, stdout=PIPE, stderr=PIPE)
|
||||
pollProcess(process)
|
||||
stdout, _ = process.communicate()
|
||||
process = execute("gita pull %s" % rootDir, shell=True, stdout=PIPE, stderr=PIPE)
|
||||
pollProcess(process, True)
|
||||
stdout, stderr = process.communicate()
|
||||
|
||||
if not process.returncode:
|
||||
logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", REVISION))
|
||||
else:
|
||||
logger.error("update could not be completed (%s)" % repr(stderr))
|
||||
|
||||
if IS_WIN:
|
||||
infoMsg = "for Windows platform it's recommended "
|
||||
infoMsg += "to use a GitHub for Windows client for updating "
|
||||
infoMsg += "purposes (http://windows.github.com/)"
|
||||
else:
|
||||
infoMsg = "for Linux platform it's recommended "
|
||||
infoMsg += "to use a standard 'git' package (e.g.: 'sudo apt-get install git')"
|
||||
|
||||
logger.info(infoMsg)
|
||||
|
||||
Reference in New Issue
Block a user