oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev3743, Fix argument parsing on unknown command

Browse source
This commit is contained in:
shortcutme 2018-12-30 12:09:22 +01:00
parent bda238344c
commit fc417e7273
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.4" self.version = "0.6.4"
self.rev = 3742 self.rev = 3743
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}
@ -354,9 +354,6 @@ class Config(object):
self.parseCommandline(argv, silent) # Parse argv self.parseCommandline(argv, silent) # Parse argv
self.setAttributes() self.setAttributes()
self.data_dir = self.data_dir.replace("\\", "/")
self.log_dir = self.log_dir.replace("\\", "/")
if not silent: if not silent:
if self.fileserver_ip != "*" and self.fileserver_ip not in self.ip_local: if self.fileserver_ip != "*" and self.fileserver_ip not in self.ip_local:
self.ip_local.append(self.fileserver_ip) self.ip_local.append(self.fileserver_ip)
@ -421,6 +418,8 @@ class Config(object):
for key, val in args.items(): for key, val in args.items():
if type(val) is list: if type(val) is list:
val = val[:] val = val[:]
if key in ("data_dir", "log_dir"):
val = bal.replace("\\", "/")
setattr(self, key, val) setattr(self, key, val)
def loadPlugins(self): def loadPlugins(self):