From ddb8b27d5056074013a89d8ab277e39fdc1f069d Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Fri, 20 Nov 2015 13:57:31 +0000
Subject: WIP Add support for multiple sources per chunk

TODO:
- Add API to the cache server to retrieve a submodule commit from a
  given path.
- Fix cross-bootstrap command.

Change-Id: I3475c2bcb648a272fee33bc878a521f79d4e6581
---
 morphlib/cachekeycomputer.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'morphlib/cachekeycomputer.py')

diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py
index 22f42aa0..ff0d595a 100644
--- a/morphlib/cachekeycomputer.py
+++ b/morphlib/cachekeycomputer.py
@@ -96,6 +96,11 @@ class CacheKeyComputer(object):
             keys['split-rules'] = [(a, [rgx.pattern for rgx in r._regexes])
                                    for (a, r) in source.split_rules]
 
+            # Avoid adding the 'extra-trees' key if there were no
+            # extra-sources, to avoid unnecessary rebuilds
+            if source.subtrees: # pragma no cover
+                keys['extra-trees'] = source.subtrees
+
             # Include morphology contents, since it doesn't always come
             # from the source tree
             keys['devices'] = morphology.get('devices')
-- 
cgit v1.2.1