starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make _comment_directive more defensive

Browse Source
This commit is contained in:
Brad Warren
2016-08-16 18:30:45 -07:00
parent 671d7ee194
commit 76c2fe579a
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-nginx/certbot_nginx/parser.py
+9 -10
View File
@@ -531,18 +531,17 @@ COMMENT_BLOCK = [' ', '#', COMMENT]
def _comment_directive(block, location): def _comment_directive(block, location):
"""Add a comment to the end of the line at location.""" """Add a comment to the end of the line at location."""
if len(block) > location + 1: # there is a block after us next_entry = block[location + 1] if location + 1 < len(block) else None
next_entry = block[location + 1] if isinstance(next_entry, list) and next_entry:
else: if COMMENT in next_entry[-1]:
# we're at the end of the block, pretend there's a newline after us;
# it will actually be added later in add_directives
next_entry = "\n"
if isinstance(next_entry, list):
if "Certbot" in next_entry[-1]:
return return
next_entry = next_entry.spaced[0] # pylint: disable=no-member elif isinstance(next_entry, nginxparser.UnspacedList):
next_entry = next_entry.spaced[0]
else:
next_entry = next_entry[0]
block.insert(location + 1, COMMENT_BLOCK[:]) block.insert(location + 1, COMMENT_BLOCK[:])
if "\n" not in next_entry: if next_entry is not None and "\n" not in next_entry:
block.insert(location + 2, '\n') block.insert(location + 2, '\n')