summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-09-19 21:15:56 +0000
committerChris Lumens <clumens@redhat.com>2005-09-19 21:15:56 +0000
commit3437f6c278c46e7084ecdee001a1a408385f4f3e (patch)
tree894da46b3cd78fb0f11d04261b0c7eeef6898a2f
parent2999d8db1a7a7a08d933e9df9f5da15f499fb950 (diff)
downloadanaconda-3437f6c278c46e7084ecdee001a1a408385f4f3e.tar.gz
anaconda-3437f6c278c46e7084ecdee001a1a408385f4f3e.tar.xz
anaconda-3437f6c278c46e7084ecdee001a1a408385f4f3e.zip
Add package header data to the ksdata.
-rw-r--r--ChangeLog5
-rw-r--r--kickstartData.py6
-rw-r--r--kickstartParser.py8
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c54dfade..ecd67e306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19 Chris Lumens <clumens@redhat.com>
+
+ * kickstartData.py: Add package header data.
+ * kickstartParser.py (KickstartParser.handlePackageHdr): Likewise.
+
2005-09-19 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/kickstartData.py b/kickstartData.py
index 47adeff69..16144077b 100644
--- a/kickstartData.py
+++ b/kickstartData.py
@@ -14,6 +14,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
from constants import *
+from kickstartParser import KS_MISSING_PROMPT, KS_MISSING_IGNORE
DISPLAY_MODE_CMDLINE = 0
DISPLAY_MODE_GRAPHICAL = 1
@@ -65,6 +66,11 @@ class KickstartData:
self.raidList = []
self.vgList = []
+ # Set by %package header.
+ self.excludeDocs = False
+ self.addBase = True
+ self.handleMissing = KS_MISSING_PROMPT
+
# Set by sections.
self.groupList = []
self.packageList = []
diff --git a/kickstartParser.py b/kickstartParser.py
index e134e4ec4..e6d7c0474 100644
--- a/kickstartParser.py
+++ b/kickstartParser.py
@@ -737,12 +737,12 @@ class KickstartParser:
(opts, extra) = op.parse_args(args=args[1:])
- self.excludeDocs = opts.excludedocs
- self.addBase = not opts.nobase
+ ksdata.excludeDocs = opts.excludedocs
+ ksdata.addBase = not opts.nobase
if opts.ignoremissing:
- self.handleMissing = KS_MISSING_IGNORE
+ ksdata.handleMissing = KS_MISSING_IGNORE
else:
- self.handleMissing = KS_MISSING_PROMPT
+ ksdata.handleMissing = KS_MISSING_PROMPT
def handleScriptHdr (self, args, script):
op = KSOptionParser()