equal
deleted
inserted
replaced
847 try: |
847 try: |
848 self.master.run() |
848 self.master.run() |
849 finally: |
849 finally: |
850 self.master.shutdown() |
850 self.master.shutdown() |
851 |
851 |
852 runargs = None |
|
853 if 'inserve' not in sys.argv: |
852 if 'inserve' not in sys.argv: |
854 runargs = [sys.argv[0], 'inserve', '-R', root] |
853 runargs = [sys.argv[0], 'inserve', '-R', root] |
|
854 else: |
|
855 runargs = sys.argv[:] |
|
856 |
|
857 pidfile = ui.config('inotify', 'pidfile') |
|
858 if opts['daemon'] and pidfile is not None and 'pid-file' not in runargs: |
|
859 runargs.append("--pid-file=%s" % pidfile) |
855 |
860 |
856 service = service() |
861 service = service() |
857 logfile = ui.config('inotify', 'log') |
862 logfile = ui.config('inotify', 'log') |
858 cmdutil.service(opts, initfn=service.init, runfn=service.run, |
863 cmdutil.service(opts, initfn=service.init, runfn=service.run, |
859 logfile=logfile, runargs=runargs) |
864 logfile=logfile, runargs=runargs) |