From 45d8bbb3439705a9f0abf1beaaf328ffa0d48a00 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Fri, 28 Oct 2005 17:01:39 +0000 Subject: [PATCH] Add --resolvedeps and --includedeps as deprecated options to %packages. Pass line number to handlePackageHdr and handleScriptHdr. --- ChangeLog | 6 ++++++ pykickstart/parser.py | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0066b3..52e4d56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-28 Chris Lumens + + * pykickstart/parser.py: Add --resolvedeps and --includedeps as + deprecated options to %packages. Pass line number to handlePackageHdr + and handleScriptHdr. + 2005-10-24 Chris Lumens * pykickstart.spec: Bump version. diff --git a/pykickstart/parser.py b/pykickstart/parser.py index 0b36a77..e2493b1 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py @@ -802,14 +802,18 @@ class KickstartParser: setattr(self.handler, "lineno", lineno) self.handler.handlers[cmd](cmdArgs) - def handlePackageHdr (self, args): - op = KSOptionParser() + def handlePackageHdr (self, lineno, args): + op = KSOptionParser(lineno=lineno) op.add_option("--excludedocs", dest="excludedocs", action="store_true", default=False) op.add_option("--ignoremissing", dest="ignoremissing", action="store_true", default=False) op.add_option("--nobase", dest="nobase", action="store_true", default=False) + op.add_option("--ignoredeps", dest="resolveDeps", action="store_false", + deprecated=1) + op.add_option("--resolvedeps", dest="resolveDeps", action="store_true", + deprecated=1) (opts, extra) = op.parse_args(args=args[1:]) @@ -820,8 +824,8 @@ class KickstartParser: else: self.ksdata.handleMissing = KS_MISSING_PROMPT - def handleScriptHdr (self, args): - op = KSOptionParser() + def handleScriptHdr (self, lineno, args): + op = KSOptionParser(lineno=lineno) op.add_option("--erroronfail", dest="errorOnFail", action="store_true", default=False) op.add_option("--interpreter", dest="interpreter", default="/bin/sh") @@ -907,7 +911,7 @@ class KickstartParser: self.state = STATE_SCRIPT_HDR elif args[0] == "%packages": needLine = True - self.handlePackageHdr (args) + self.handlePackageHdr (lineno, args) elif args[0][0] == '%': raise KickstartParseError, formatErrorMsg(lineno) else: @@ -933,7 +937,7 @@ class KickstartParser: elif args[0][0] == '%': raise KickstartParseError, formatErrorMsg(lineno) - self.handleScriptHdr (args) + self.handleScriptHdr (lineno, args) elif self.state in [STATE_PRE, STATE_POST, STATE_TRACEBACK]: # If this is part of a script, append to it. -- 2.11.4.GIT