Attachment 709024 Details for Bug 920707 – parser.py: Allow shlex to strip lines

parser.py: Allow shlex to strip lines

file_920707.txt (text/plain), 1.10 KB, created by fedora.dm0 on 2013-03-12 15:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fedora.dm0

Created: 2013-03-12 15:16:25 UTC

Size: 1.10 KB

patch

obsolete

>From: David Michael <fedora.dm0@gmail.com>
>Date: Tue, 12 Mar 2013 10:35:30 -0400
>Subject: [PATCH] parser.py: Allow shlex to strip lines
>
>The previous behavior could have caused shlex to abort the process
>during script includes, when their first line contained a trailing
>escape for line continuation or a comment character in a string.
>---
> pykickstart/parser.py | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/pykickstart/parser.py b/pykickstart/parser.py
>index 3d90411..c37ec62 100644
>--- a/pykickstart/parser.py
>+++ b/pykickstart/parser.py
>@@ -638,11 +638,8 @@ class KickstartParser:
>                 self._handleSpecialComments(self._line)
>                 continue
> 
>-            # Remove any end-of-line comments.
>-            sanitized = self._line.split("#")[0]
>-
>-            # Then split the line.
>-            args = shlex.split(sanitized.rstrip())
>+            # Split the line, discarding comments.
>+            args = shlex.split(self._line, comments=True)
> 
>             if args[0] == "%include":
>                 if len(args) == 1 or not args[1]:
>-- 
>1.8.1.4

Actions: View

Attachments on bug 920707: 709024