Mercurial > hg
diff mercurial/commandserver.py @ 37120:a8a902d7176e
procutil: bulk-replace function calls to point to new module
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 24 Mar 2018 15:10:51 +0900 |
parents | d4a2e0d5d042 |
children | 4f742c2cb837 |
line wrap: on
line diff
--- a/mercurial/commandserver.py Sat Mar 24 15:09:33 2018 +0900 +++ b/mercurial/commandserver.py Sat Mar 24 15:10:51 2018 +0900 @@ -288,7 +288,7 @@ hellomsg += '\n' hellomsg += 'encoding: ' + encoding.encoding hellomsg += '\n' - hellomsg += 'pid: %d' % util.getpid() + hellomsg += 'pid: %d' % procutil.getpid() if util.safehasattr(os, 'getpgid'): hellomsg += '\n' hellomsg += 'pgid: %d' % os.getpgid(0) @@ -457,8 +457,8 @@ def init(self): self._sock = socket.socket(socket.AF_UNIX) self._servicehandler.bindsocket(self._sock, self.address) - if util.safehasattr(util, 'unblocksignal'): - util.unblocksignal(signal.SIGCHLD) + if util.safehasattr(procutil, 'unblocksignal'): + procutil.unblocksignal(signal.SIGCHLD) o = signal.signal(signal.SIGCHLD, self._sigchldhandler) self._oldsigchldhandler = o self._socketunlinked = False