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

List:       kde-commits
Subject:    [sysadmin/ci-tooling] helpers/helperslib: Also process the project's negated deps
From:       Aleix Pol <null () kde ! org>
Date:       2018-06-01 0:12:28
Message-ID: E1fOXgC-0004Eu-Qn () code ! kde ! org
[Download RAW message or body]

Git commit ed802f5e2fdfd42b2860ba62cccff783c8b3f038 by Aleix Pol.
Committed on 01/06/2018 at 00:11.
Pushed by apol into branch 'master'.

Also process the project's negated deps

Re-apply the patch as discussed here:
https://phabricator.kde.org/R857:0d78f5b23dfc07f8e4b9251c8ba9c150aae5b6a8

M  +1    -1    helpers/helperslib/Buildable.py

https://commits.kde.org/sysadmin/ci-tooling/ed802f5e2fdfd42b2860ba62cccff783c8b3f038

diff --git a/helpers/helperslib/Buildable.py b/helpers/helperslib/Buildable.py
index 1f72792..1fa0793 100644
--- a/helpers/helperslib/Buildable.py
+++ b/helpers/helperslib/Buildable.py
@@ -219,7 +219,7 @@ class DependencyResolver(object):
 
 			# Start our list of dependencies
 			# Run the list of dynamic dependencies against the dynamic negations to determine \
                which ones we need to keep
-			ourDeps = finalDynamic = self._processDependencyNegation( dynamicDeps, \
negatedDynamic ) +			ourDeps = finalDynamic = self._processDependencyNegation( \
dynamicDeps, negatedDynamic + project.negatedDeps )  
 		# Add the project level dependencies to the list of our dependencies
 		# Then run the list of our dependencies against the project negations


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