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

List:       kde-commits
Subject:    [craft] /: Cleanup
From:       Hannah von Reth <null () kde ! org>
Date:       2017-07-22 11:34:33
Message-ID: E1dYsg5-00010I-OQ () code ! kde ! org
[Download RAW message or body]

Git commit 397727fb6046ffa2fef2bccc24d3c61791af33cc by Hannah von Reth.
Committed on 22/07/2017 at 11:34.
Pushed by vonreth into branch 'master'.

Cleanup

M  +0    -2    bin/CraftConfig.py
M  +1    -1    setup/CraftBootstrap.py

https://commits.kde.org/craft/397727fb6046ffa2fef2bccc24d3c61791af33cc

diff --git a/bin/CraftConfig.py b/bin/CraftConfig.py
index 1f7ab341b..11d583a8c 100644
--- a/bin/CraftConfig.py
+++ b/bin/CraftConfig.py
@@ -196,8 +196,6 @@ class CraftConfig( object ):
         }.items():
             if not key in self._config["Variables"]:
                 self._config["Variables"][key] = value
-        if not os.name == "nt":
-            self.set("Portage", "Ignores", self.get("Portage", "Ignores")  + ";dev-util/.*;gnuwin32/.*")
 
     def __contains__( self, key ):
         return self.__contains_no_alias(key) or \
diff --git a/setup/CraftBootstrap.py b/setup/CraftBootstrap.py
index 34865d766..eb96b71ae 100644
--- a/setup/CraftBootstrap.py
+++ b/setup/CraftBootstrap.py
@@ -167,7 +167,7 @@ def getABI():
 def getIgnores():
     if CraftBootstrap.isWin():
         return ""
-    ignores = "dev-util/.*;binary/.*;kdesupport/kdewin"
+    ignores = "gnuwin32/.*;dev-util/.*;binary/.*;kdesupport/kdewin"
     print(f"On your os we blacklist the following packages.\n"
           f"Ignores: {ignores}")
     ignores += CraftBootstrap.promptForChoice("We recommend to also ignore the win32libs category\n"
[prev in list] [next in list] [prev in thread] [next in thread]