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

[Phil Thompson]

On Friday 15 December 2006 10:58 pm, Matt Newell wrote:
> 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):

Fixed - thanks.

Phil