[PyKDE] [PATCH] Bug in siputils.py, causes linux-g++-64 build to have wrong LIBDIR_X11

[Matt Newell]

This bug related to the qmake_build_file_reader is causing the last portion of 
qmake.conf after the last include(...) to not be read, so the LIBDIR_X11 
never gets set to /usr/X11R6/lib64, and breaks builds for linux-g++-64.

Index: siputils.py
===================================================================
--- siputils.py (revision 3787)
+++ siputils.py (working copy)
@@ -2028,6 +2028,10 @@
             self._openfile(filename)

         def _openfile(self, filename):
+            if hasattr(self,'currentfile'):
+                self.filestack.append(self.currentfile)
+                self.pathstack.append(self.path)
+
             try:
                 self.currentfile = open(filename, 'r')
             except IOError, detail:
@@ -2037,8 +2041,6 @@

                 error("Unable to open %s: %s" % (filename, detail))

-            self.filestack.append(self.currentfile)
-            self.pathstack.append(self.path)
             self.path = os.path.dirname(filename)

         def readline(self):


-------------- next part --------------
A non-text attachment was scrubbed...
Name: siputils.py.patch
Type: text/x-diff
Size: 794 bytes
Desc: not available
Url : http://www.riverbankcomputing.com/pipermail/pyqt/attachments/20061215/7e848f41/siputils.py.bin