aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tinderbox/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tinderbox/__init__.py b/src/tinderbox/__init__.py
index 66fe821..edad312 100644
--- a/src/tinderbox/__init__.py
+++ b/src/tinderbox/__init__.py
@@ -24,6 +24,9 @@ from logger import log, init_logging
class Tinderbox(object):
+
+ NOMERGE_PKGS=['sys-apps/portage']
+
def __init__(self):
self.hostname = config.MATCHBOX_HOST
self.port = config.MATCHBOX_PORT
@@ -366,7 +369,7 @@ class Tinderbox(object):
deps_expanded = []
max_dep_versions = 0
for dep in deps:
- if dep[0].startswith('!'):
+ if dep[0].startswith('!') or dep in self.NOMERGE_PKGS:
continue
dep_useflag = list(portage.dep.dep_getusedeps(dep))
if 0 == len(dep_useflag):