[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [craft-blueprints-kde] libs/qt5/qtbase: Also fix cached version
From:       Hannah von Reth <null () kde ! org>
Date:       2018-09-28 8:32:10
Message-ID: E1g5oC2-0001yb-Rd () code ! kde ! org
[Download RAW message or body]

Git commit ad42ca9e5be851be44eab8ad8d124d5156f39bfb by Hannah von Reth.
Committed on 28/09/2018 at 08:32.
Pushed by vonreth into branch 'master'.

Also fix cached version

M  +9    -2    libs/qt5/qtbase/qtbase.py

https://commits.kde.org/craft-blueprints-kde/ad42ca9e5be851be44eab8ad8d124d5156f39bfb

diff --git a/libs/qt5/qtbase/qtbase.py b/libs/qt5/qtbase/qtbase.py
index 1f74d00..d3072fa 100644
--- a/libs/qt5/qtbase/qtbase.py
+++ b/libs/qt5/qtbase/qtbase.py
@@ -206,8 +206,7 @@ class QtPackage(Qt5CorePackageBase):
                 return False
             parser = configparser.ConfigParser()
             parser.read(os.path.join(self.buildDir(), "bin", "qt.conf"))
-            if parser.has_section("EffectiveSourcePaths"):
-                parser.remove_section("EffectiveSourcePaths")
+            parser.remove_section("EffectiveSourcePaths")
             parser.write(os.path.join(self.imageDir(), "bin", "qt.conf"))
 
             # install msvc debug files if available
@@ -224,6 +223,14 @@ class QtPackage(Qt5CorePackageBase):
             return True
 
     def postInstall(self):
+        # TODO: remove after the next cache rebuild (now 5.11.2)
+        conf = os.path.join(self.imageDir(), "bin", "qt.conf")
+        if os.path.exists(conf):
+            parser = configparser.ConfigParser()
+            parser.read(conf)
+            parser.remove_section("EffectiveSourcePaths")
+            parser.write(conf)
+
         if CraftCore.compiler.isWindows and CraftCore.settings.getboolean("Packager", "UseCache"):
             return utils.system(["qtbinpatcher", "--nobackup",
                                  f"--qt-dir={self.installDir()}",
[prev in list] [next in list] [prev in thread] [next in thread]