rpms/pykickstart/F-8 pykickstart-1.29.lineno.patch, NONE, 1.1 pykickstart-1.29.version.patch, NONE, 1.1 pykickstart.spec, 1.82, 1.83

[Christopher Edward Lumens (clumens)]

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14763

Modified Files:
	pykickstart.spec 
Added Files:
	pykickstart-1.29.lineno.patch pykickstart-1.29.version.patch 
Log Message:
Rebuild for an update.


pykickstart-1.29.lineno.patch:

--- NEW FILE pykickstart-1.29.lineno.patch ---
diff -ruN pykickstart-1.29.orig/ChangeLog pykickstart-1.29/ChangeLog
--- pykickstart-1.29.orig/ChangeLog	2008-01-30 14:10:42.000000000 -0500
+++ pykickstart-1.29/ChangeLog	2008-06-10 13:28:12.000000000 -0400
@@ -157,12 +157,6 @@
 
     Remove .cvsignore files.
 
-commit eda22251023801ff7b969c48d001e28202e6544c
-Author: Chris Lumens <clumens at exeter.boston.redhat.com>
-Date:   Mon Nov 5 10:24:16 2007 -0500
-
-    Save the line number the script starts on as a debugging aid in anaconda.
-
 commit 29b94676e008a93253f96af91f496a2dd5e0e05b
 Author: Chris Lumens <clumens at exeter.boston.redhat.com>
 Date:   Wed Oct 31 16:40:42 2007 -0400
diff -ruN pykickstart-1.29.orig/pykickstart/parser.py pykickstart-1.29/pykickstart/parser.py
--- pykickstart-1.29.orig/pykickstart/parser.py	2008-01-30 14:09:13.000000000 -0500
+++ pykickstart-1.29/pykickstart/parser.py	2008-06-10 13:27:38.000000000 -0400
@@ -152,8 +152,7 @@
        script.  Instances of Script are held in a list by the Version object.
     """
     def __init__(self, script, interp = "/bin/sh", inChroot = False,
-                 lineno = None, logfile = None, errorOnFail = False,
-                 type = KS_SCRIPT_PRE):
+                 logfile = None, errorOnFail = False, type = KS_SCRIPT_PRE):
         """Create a new Script instance.  Instance attributes:
 
            errorOnFail -- If execution of the script fails, should anaconda
@@ -163,7 +162,6 @@
                           environment or not?
            interp      -- The program that should be used to interpret this
                           script.
-           lineno      -- The line number this script starts on.
            logfile     -- Where all messages from the script should be logged.
            script      -- A string containing all the lines of the script.
            type        -- The type of the script, which can be KS_SCRIPT_* from
@@ -172,7 +170,6 @@
         self.script = string.join(script, "")
         self.interp = interp
         self.inChroot = inChroot
-        self.lineno = lineno
         self.logfile = logfile
         self.errorOnFail = errorOnFail
         self.type = type
@@ -400,12 +397,9 @@
         if string.join(self._script["body"]).strip() == "":
             return
 
-        s = Script (self._script["body"], interp=self._script["interp"],
-                    inChroot=self._script["chroot"],
-                    lineno=self._script["lineno"],
-                    logfile=self._script["log"],
-                    errorOnFail=self._script["errorOnFail"],
-                    type=self._script["type"])
+        s = Script (self._script["body"], self._script["interp"],
+                    self._script["chroot"], self._script["log"],
+                    self._script["errorOnFail"], self._script["type"])
 
         if self.handler:
             self.handler.scripts.append(s)
@@ -485,7 +479,6 @@
         (opts, extra) = op.parse_args(args=args[1:])
 
         self._script["interp"] = opts.interpreter
-        self._script["lineno"] = lineno
         self._script["log"] = opts.log
         self._script["errorOnFail"] = opts.errorOnFail
         if hasattr(opts, "nochroot"):
@@ -619,7 +612,7 @@
             elif self._state == STATE_SCRIPT_HDR:
                 needLine = True
                 self._script = {"body": [], "interp": "/bin/sh", "log": None,
-                                "errorOnFail": False, lineno: None}
+                                "errorOnFail": False}
 
                 if not args and self._includeDepth == 0:
                     self._state = STATE_END

pykickstart-1.29.version.patch:

--- NEW FILE pykickstart-1.29.version.patch ---
diff -ruN pykickstart-1.29.orig/pykickstart/version.py pykickstart-1.29/pykickstart/version.py
--- pykickstart-1.29.orig/pykickstart/version.py	2008-01-30 14:09:13.000000000 -0500
+++ pykickstart-1.29/pykickstart/version.py	2008-06-10 13:39:45.000000000 -0400
@@ -62,7 +62,7 @@
 F9 = 7000
 
 # This always points at the latest version and is the default.
-DEVEL = F9
+DEVEL = F8
 
 """A one-to-one mapping from string representations to version numbers."""
 versionMap = {


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/F-8/pykickstart.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pykickstart.spec	30 Jan 2008 19:32:33 -0000	1.82
+++ pykickstart.spec	10 Jun 2008 17:43:26 -0000	1.83
@@ -4,11 +4,13 @@
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
 Version: 1.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
+Patch0: pykickstart-1.29.lineno.patch
+Patch1: pykickstart-1.29.version.patch
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -23,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 make
 
 %build
@@ -44,6 +48,11 @@
 %{_bindir}/ksflatten
 
 %changelog
+* Tue Jun 10 2008 Chris Lumens <clumens at redhat.com> 1.29-2
+- Back out the patch to track line numbers since F8 anaconda doesn't
+  support this option (#444357).
+- Set the DEVEL version to be F8.
+
 * Wed Jan 30 2008 Chris Lumens <clumens at redhat.com> - 1.29-1
 - Renamed bootproto=ask to bootproto=query, add to RHEL5 as well. (clumens)