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

List:       kde-commits
Subject:    [craft-blueprints-kde] libs/qt5/qtbase: Remove source path from qt.conf
From:       Hannah von Reth <null () kde ! org>
Date:       2018-09-28 8:20:23
Message-ID: E1g5o0d-00025M-0G () code ! kde ! org
[Download RAW message or body]

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

Remove source path from qt.conf

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

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

diff --git a/libs/qt5/qtbase/qtbase.py b/libs/qt5/qtbase/qtbase.py
index ad59a3a..1f74d00 100644
--- a/libs/qt5/qtbase/qtbase.py
+++ b/libs/qt5/qtbase/qtbase.py
@@ -204,8 +204,11 @@ class QtPackage(Qt5CorePackageBase):
         with self.getQtBaseEnv():
             if not Qt5CorePackageBase.install(self):
                 return False
-            utils.copyFile(os.path.join(self.buildDir(), "bin", "qt.conf"),
-                           os.path.join(self.imageDir(), "bin", "qt.conf"))
+            parser = configparser.ConfigParser()
+            parser.read(os.path.join(self.buildDir(), "bin", "qt.conf"))
+            if parser.has_section("EffectiveSourcePaths"):
+                parser.remove_section("EffectiveSourcePaths")
+            parser.write(os.path.join(self.imageDir(), "bin", "qt.conf"))
 
             # install msvc debug files if available
             if CraftCore.compiler.isMSVC():
[prev in list] [next in list] [prev in thread] [next in thread]