RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/nfs: Fix whitespace handling

Browse Source 
keep whitespace in lines starting with %url

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-06-02 12:41:36 +02:00 committed by Sage Weil
parent a30328c496
commit e1928d5706
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pybind/mgr/nfs/export_utils.py
View File

@ -10,23 +10,24 @@ class GaneshaConfParser:
self.pos = 0
self.text = ""
for line in raw_config.split("\n"):
self.text += line
if line.startswith("%"):
self.text += "\n"
line = line.lstrip()
def remove_whitespaces_quotes(self):
if self.text.startswith("%url"):
self.text = self.text.replace('"', "")
else:
self.text = "".join(self.text.split())
if line.startswith("%"):
self.text += line.replace('"', "")
self.text += "\n"
else:
self.text += "".join(line.split())
def stream(self):
return self.text[self.pos:]
def last_context(self) -> str:
return f'"...{self.text[max(0, self.pos - 30):self.pos]}<here>{self.stream()[:30]}"'
def parse_block_name(self):
idx = self.stream().find('{')
if idx == -1:
raise Exception("Cannot find block name")
raise Exception(f"Cannot find block name at {self.last_context()}")
block_name = self.stream()[:idx]
self.pos += idx+1
return block_name
@ -104,7 +105,6 @@ class GaneshaConfParser:
raise Exception("Infinite loop while parsing block content")
def parse(self):
self.remove_whitespaces_quotes()
blocks = []
while self.stream():
blocks.append(self.parse_block_or_section())