Attachment 151138 Details for Bug 234351 – use urlgrabber.grabber.urlopen() to open all kickstart config files so that %include URLs can happen

[patch] use urlgrabber.grabber.urlopen() to open all kickstart config files so that %include URLs can happen

pykickstart-0.43-parser.py-take-2.diff (text/plain), 1.12 KB, created by Ryan Tilder on 2007-03-28 17:32:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Tilder

Created: 2007-03-28 17:32:35 UTC

Size: 1.12 KB

patch

obsolete

>--- pykickstart-0.43.orig/pykickstart/parser.py	2007-03-28 08:51:59.000000000 -0700
>+++ pykickstart-0.43/pykickstart/parser.py	2007-03-28 10:26:51.000000000 -0700
>@@ -23,6 +23,8 @@
> from constants import *
> from data import *
> 
>+import url.grabber as grabber
>+
> from rhpl.translate import _
> import rhpl.translate as translate
> 
>@@ -1068,7 +1070,7 @@
>         # For error reporting.
>         lineno = 0
> 
>-        fh = open(file)
>+        fh = grabber.urlopen(file)
>         needLine = True
> 
>         while True:
>@@ -1122,12 +1124,12 @@
> 
>                     try:
>                         self.readKickstart (args[1])
>-                    except IOError:
>+                    except IOError, e:
>                         # Handle the include file being provided over the
>                         # network in a %pre script.  This case comes up in the
>                         # early parsing in anaconda.
>                         if self.missingIncludeIsFatal:
>-                            raise
>+                            raise KickstartError("IOError: %s" % e)
> 
>                     self.includeDepth -= 1
>                     needLine = True

Actions: View | Diff

Attachments on bug 234351: 151136 | 151138