Attachment 155732 Details for Bug 241657 – pykickstart portion of the patch

[patch] pykickstart portion of the patch

241657.patch (text/plain), 1.82 KB, created by Chris Lumens on 2007-05-30 19:09:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lumens

Created: 2007-05-30 19:09:41 UTC

Size: 1.82 KB

patch

obsolete

>Index: pykickstart/parser.py
>===================================================================
>RCS file: /usr/local/CVS/pykickstart/pykickstart/parser.py,v
>retrieving revision 1.51
>diff -u -r1.51 parser.py
>--- pykickstart/parser.py	1 Dec 2006 15:52:18 -0000	1.51
>+++ pykickstart/parser.py	30 May 2007 18:58:49 -0000
>@@ -223,6 +223,10 @@
>         self.lineno = 0
>         self.currentCmd = ""
> 
>+        # And this is set by the parser itself as a hack so we can get at
>+        # the full unprocessed input line.
>+        self._line = ""
>+
>         self.handlers = { "auth"    : self.doAuthconfig,
>                      "authconfig"   : self.doAuthconfig,
>                      "autopart"     : self.doAutoPart,
>@@ -298,7 +302,11 @@
>         warnings.warn(_("Ignoring deprecated command on line %(lineno)s:  The %(cmd)s command has been deprecated and no longer has any effect.  It may be removed from future releases, which will result in a fatal error from kickstart.  Please modify your kickstart file to remove this command.") % mapping, DeprecationWarning)
> 
>     def doAuthconfig(self, args):
>-        self.ksdata.authconfig = string.join(args)
>+        # Need to handle the line like this because simply joining args back
>+        # together misses spaces, double quotes, or other special characters
>+        # that authconfig understands.
>+        index = self._line.find(" ")
>+        self.ksdata.authconfig = self._line[index:].strip()
> 
>     def doAutoPart(self, args):
>         if len(args) > 0:
>@@ -1146,6 +1154,9 @@
>                     raise KickstartParseError, formatErrorMsg(lineno)
>                 else:
>                     needLine = True
>+
>+                    if self.handler:
>+                        self.handler._line = line
> 
>                     if self.errorsAreFatal:
>                         self.handleCommand(lineno, args)

Actions: View | Diff

Attachments on bug 241657: 155732 | 155733