MSWin fixes
This commit is contained in:
parent
988e621712
commit
f77b1b73f4
3 changed files with 3 additions and 5 deletions
|
|
@ -436,8 +436,7 @@ class CoinDaemon(Daemon):
|
|||
|
||||
fn_stem = f'{self.id}-{self.network}-daemon-{self.bind_port}'
|
||||
self.logfile = self.network_datadir / (fn_stem + '.log')
|
||||
if self.use_pidfile:
|
||||
self.pidfile = self.network_datadir / (fn_stem + '.pid')
|
||||
self.pidfile = self.network_datadir / (fn_stem + '.pid')
|
||||
|
||||
self.init_subclass()
|
||||
|
||||
|
|
|
|||
|
|
@ -116,8 +116,7 @@ class MoneroWalletDaemon(RPCDaemon):
|
|||
self.wallet_dir = MoneroTwCtl.get_tw_dir(self.proto)
|
||||
|
||||
fn_stem = f'{self.exec_fn}-{self.bind_port}'
|
||||
if self.use_pidfile:
|
||||
self.pidfile = self.proto.network_datadir / (fn_stem + '.pid')
|
||||
self.pidfile = self.proto.network_datadir / (fn_stem + '.pid')
|
||||
self.logfile = self.proto.network_datadir / (fn_stem + '.log')
|
||||
|
||||
self.proxy = proxy
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ if not po.user_opts.get('skip_deps'):
|
|||
for fn in (data_dir, autosign_data_dir):
|
||||
try:
|
||||
os.unlink(fn)
|
||||
except IsADirectoryError:
|
||||
except (IsADirectoryError, PermissionError):
|
||||
import shutil
|
||||
shutil.rmtree(fn)
|
||||
except FileNotFoundError:
|
||||
|
|
|
|||
Loading…
Reference in a new issue