Merge branch 'proc-psutil'

Conflicts: pwnlib/util/proc.py setup.py
kristoff3r · Nov 9, 2014 · 406dce8 · 406dce8
2 parents 09f69d8 + c55273c
commit 406dce8
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 164 deletions.
diff --git a/pwnlib/gdb.py b/pwnlib/gdb.py
@@ -218,9 +218,7 @@ def findexe():
     log.info('running in new terminal: %s' % cmd)
     misc.run_in_new_terminal(cmd)
     if pid:
-        log.waitfor('Waiting for debugger')
         proc.wait_for_debugger(pid)
-        log.done_success()
 
 def ssh_gdb(ssh, process, execute = None, arch = None, **kwargs):
     if isinstance(process, (list, tuple)):