sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-29 04:53:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Another update for Issue #52

Browse Source
This commit is contained in:
Miroslav Stampar 2012-07-03 16:49:34 +02:00
parent 70f754f6c5
commit ada627a022
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/core/subprocessng.py
View File

@ -71,7 +71,7 @@ def setNonBlocking(fd):
flags = flags | os.O_NONBLOCK flags = flags | os.O_NONBLOCK
fcntl.fcntl(fd, FCNTL.F_SETFL, flags) fcntl.fcntl(fd, FCNTL.F_SETFL, flags)
def pollProcess(process): def pollProcess(process, suppress_errors=False):
while True: while True:
dataToStdout(".") dataToStdout(".")
time.sleep(1) time.sleep(1)
@ -79,11 +79,12 @@ def pollProcess(process):
returncode = process.poll() returncode = process.poll()
if returncode is not None: if returncode is not None:
if returncode == 0: if not suppress_errors:
dataToStdout(" done\n") if returncode == 0:
elif returncode < 0: dataToStdout(" done\n")
dataToStdout(" process terminated by signal %d\n" % returncode) elif returncode < 0:
elif returncode > 0: dataToStdout(" process terminated by signal %d\n" % returncode)
dataToStdout(" quit unexpectedly with return code %d\n" % returncode) elif returncode > 0:
dataToStdout(" quit unexpectedly with return code %d\n" % returncode)
break break

20
lib/core/update.py
View File

@ -35,15 +35,21 @@ def update():
logger.debug(debugMsg) logger.debug(debugMsg)
dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X")) dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X"))
process = execute("git pull %s" % rootDir, shell=True, stdout=PIPE, stderr=PIPE) process = execute("gita pull %s" % rootDir, shell=True, stdout=PIPE, stderr=PIPE)
pollProcess(process) pollProcess(process, True)
stdout, _ = process.communicate() stdout, stderr = process.communicate()
if not process.returncode: if not process.returncode:
logger.info("%s the latest revision '%s'" % ("already at" if "Already" in stdout else "updated to", REVISION)) 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')"
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/)"
logger.info(infoMsg) logger.info(infoMsg)