element.py: clobber sources with workspace

add name to sources in cache key dict

30 files changed, 43 insertions, 32 deletions

diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index ee05153fe..d076e8799 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -2155,11 +2155,23 @@ class Element(Plugin):
                 'element-plugin-version': self.BST_ARTIFACT_VERSION,
                 'sandbox': self.__sandbox_config.get_unique_key(),
                 'environment': cache_env,
-                'sources': [s._get_unique_key(workspace is None) for s in self.__sources],
-                'workspace': '' if workspace is None else workspace.get_key(self._get_project()),
-                'public': self.__public._strip_node_info(),
+                'public': self.__public._strip_node_info()
             }
 
+            def __get_source_entry(_source):
+                return {'key': _source._get_unique_key(True),
+                        'name': _source._get_source_name()}
+
+            def __get_workspace_entry(workspace):
+                return {'key': workspace.get_key()}
+
+            if workspace is None:
+                self.__cache_key_dict['sources'] = \
+                    [__get_source_entry(s) for s in self.__sources]
+            else:
+                self.__cache_key_dict['sources'] = \
+                    [__get_workspace_entry(workspace)]
+
             self.__cache_key_dict['fatal-warnings'] = sorted(project._fatal_warnings)
 
         cache_key_dict = self.__cache_key_dict.copy()
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index 37845766b..94faf95c8 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-94948e3c3910d667b21483af13e848416215e2774cfbabd121419ab47808216d
\ No newline at end of file
+e6ab4d95bce16f19bd67db8abd6bffdbee25602a6b32c7ebfc9df965bfc3ebe7
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected
index 8d1e34d73..3a8413be3 100644
--- a/tests/cachekey/project/elements/build2.expected
+++ b/tests/cachekey/project/elements/build2.expected
@@ -1 +1 @@
-3b889b8609868f86a306ef8fdbd6c58b1d66e65608e0bba87e9cd04363b4cd67
\ No newline at end of file
+e80d089fa4b0934fb8fd04259c51c8db045114770e4ba0ef531fae73e43c5a8a
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index b45d529da..8d00e5c44 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-a0a57226f18568debd6ebfe0ef449051f8f3aa6215755e14084058ffaaee990d
\ No newline at end of file
+e91019742fc42fb6758d0204e62179522fe886712657ae0e56a544c073e76330
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index fde8787c2..a45e2d114 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-59b642396967d19cfec9e3439a0059138af296281a8ec5b7e08bbc37ea8fb9cf
\ No newline at end of file
+d33107bfa4197b45ba934926829ffcab207cb14885e57541b4d73a7811ef6d23
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index f8166a48e..6296f5acd 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-fcfa8013eeba3b4195a6926be99faf109919e496a0a6af2d565a082e0df05456
\ No newline at end of file
+603c482bc6b35a30916c5f9404089decb31744518e07bd4488883f0ce3ffce94
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index bf891abc4..ea50ddf9d 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-24ddb985879273f1c7b455d8e09ff0030e843cb2ed5032c13d5e63cea89320ee
\ No newline at end of file
+433c0e5b6c0eeeb042e3f6ac39819847c424d104b0cf2ccb7ee48a2eba5bec2e
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index 093e3ce1e..778ddf9fa 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-35a732fc7caae8880968a02b642f6892efe0e513e8c26be0ab3f8682387d396a
\ No newline at end of file
+35c484d8deb9cb0f8f8a8ec1c3306a0b43846df7d658aa4bfff5d4ff146b98e3
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index 623509bca..64e4e9e8c 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-107eb5727d375491c821ef03348563ea93b82f759563595f228822d6369ac77b
\ No newline at end of file
+a698b669286dccb0708decaec3ea21e77a1eb1c15fe6769f0546d6dc94098f0f
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 0ccd07178..1ea98853b 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-8927971364d83047882da103bb735480aecc4731d73f98b59c4f31ace8d69a9d
\ No newline at end of file
+9f6c90d1b4233edcf1feee49e5486ab1ede1ade54fea285dbc041fddb8c3ee85
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index d45f9e2ef..1477e1f98 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-2edb89db7362388b8c3348f4bd54526ce3f0d70424032a1823ee9d7937319fdd
\ No newline at end of file
+4a1f95eecfdddb85d7777e1222fd53f2ffec4fc8aca522d3121c5db329b5cfd4
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index 49d3de948..a39f5b473 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-ad71c0411786aae31e637de6933fcbc5378f64b59e6920640962c8f2044e8621
\ No newline at end of file
+c034688a87a56c7bbfcb07768cdbe5972bb6bf7185bca6e0b68690e62d082221
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index 87b8352a3..e3c1a5849 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-e0a38e609d22cbafe0e7afc4d98774397a688937104d34e98b49de8d0f40dd11
\ No newline at end of file
+3fbc889608c104a896ed00fdad5039c78b518f030a22445e8f35c1a46f2641fe
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index e5db928f4..9c378a8c4 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-be42caffae813bd3948cce2398751ba3e3a22273a4e7f76df95d4e1a837aefea
\ No newline at end of file
+06bf94e28ae33c274ecae393e67e88c8b4cd1e5273e3eefb6ea7e3a55a1aa36e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index c953e4de1..e79512f64 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-1842c4938712621d3c2083325e452b96908b9dfe62c5438ee000fb0397dda040
\ No newline at end of file
+2f6e88b606b9d0a1fb89a05cb980c489af702da6916fb45aad22bc57f8c185bd
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected
index ae89b7ec6..abbe86541 100644
--- a/tests/cachekey/project/sources/git3.expected
+++ b/tests/cachekey/project/sources/git3.expected
@@ -1 +1 @@
-71f2db5f71d657358bdeccb99dcd4f0f71f9d247a795f1c70d0164b5a680f253
\ No newline at end of file
+5ca9393e03b7a79ec9807437355b12884f7ecbe94974aeb027e5c5e556c61af9
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index 623509bca..64e4e9e8c 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-107eb5727d375491c821ef03348563ea93b82f759563595f228822d6369ac77b
\ No newline at end of file
+a698b669286dccb0708decaec3ea21e77a1eb1c15fe6769f0546d6dc94098f0f
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index 9e047a458..879e7ce78 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-11bd19e914974e3d72a56c087a733c4c5b21322482fd4a8da36021d1f6010e50
\ No newline at end of file
+9bb8a6b3d070ecb128a9efc230541c181fc1a01b55366408178d3bbae0d19227
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/ostree1.expected b/tests/cachekey/project/sources/ostree1.expected
deleted file mode 100644
index f86971ec4..000000000
--- a/tests/cachekey/project/sources/ostree1.expected
+++ /dev/null
@@ -1 +0,0 @@
-41b27b94ec76b5df79a441c30889da5b82a0b658a498933a05b6a813d8c0e2b7
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index 64f59ee3e..09ee49620 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-b433354dfe18161cdb1b0572d3e40721907573fd389082ad5ea084a815acc8e9
\ No newline at end of file
+4a469716d7d0794cc10c6b96fca464d013f666b0c963247331d95c6430736911
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index b8230e214..108ab96d3 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-4f821f8e5e669eabe057a9cfe3671ea25b31389f73506f357564bab68b208c7c
\ No newline at end of file
+5a63e9e1e4dff9396672e7ca0d601ad283d726b34c0032059abed886ee05d83e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index 452dd39fd..6f71728b9 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-87a21d9bac742744f065d08f8c258e354d6f70b784d248e76ec8b7b20bb2504c
\ No newline at end of file
+f043f8b598b54510d95bf2790993bcb58e84cba0fda7880c7ea067851fa7d837
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected
index ab46fd497..3bfc2c9e6 100644
--- a/tests/cachekey/project/sources/pip1.expected
+++ b/tests/cachekey/project/sources/pip1.expected
@@ -1 +1 @@
-6104c4f54abdb9b61014877e46f71ebfd63323008a707b5cdf031a8d56c9c917
\ No newline at end of file
+18399d7df3e760a4969ba0dd6713292904aa3232cc44858c9d3e43415d0374da
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected
index e90158823..0806d83d7 100644
--- a/tests/cachekey/project/sources/remote1.expected
+++ b/tests/cachekey/project/sources/remote1.expected
@@ -1 +1 @@
-c69fceb47d247b8b92c9451fe4f566817352d048129493cc62fe1c7f186e1f51
\ No newline at end of file
+fc2ca1ea82c847c136ceb3d740ef6d967029ced16374fbd05ce94e3d2d9f5432
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected
index d04d52f73..7a7d5c5e6 100644
--- a/tests/cachekey/project/sources/remote2.expected
+++ b/tests/cachekey/project/sources/remote2.expected
@@ -1 +1 @@
-1d3aa16bbc3ee7bde2d4b7119dcb57c30725f0cac2352338a158e52ba2adeb69
\ No newline at end of file
+9e03e1639101647fc722477cf887dc5979d9b5b2a8eee98893595517da248e1e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index 93009d09b..dc700b676 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-87b6c1466ae7a2623ce36b4a1fa4f9cc244ad414e83f2ad650c55c267c9ea2d4
\ No newline at end of file
+5d7c53e3cf9f86f7ddb117b4d306ead4406381c2e14b695eb8cfbb58cb167d7a
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index 9285cc1e3..45b9633f3 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-df10d451bf5cf2e1bc0d2214c6d103e2400434bcacf8b7125997ff8ed11f5a0a
\ No newline at end of file
+22d5a9566a6d81b1cc462a8cdb45853f732ee337a2041a5a0a7f72c0637a8a7d
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index 356bfa0ef..edee1b0a9 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-149e9a09d5524cddf9647706a9e842763d345e2c6c1c88907e4cbc0724046d4e
\ No newline at end of file
+a95cda39aacfa90ab813cc2e6ec641dfd27723123d7a4f987e9b9f3d9b870cae
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index da5b5f0dd..93a4c2281 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-2106f9a2e4bbe0a2a307e25272c96e828b9b97d197192d6fb6048dc83437d305
\ No newline at end of file
+abce5ee1a61a4d446cde956ef82d221fd15f0917d61d1ddd656aabe73652eb39
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index a2076ad0d..938b9a7e3 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-c544f5b34525019a94ebf546ffd8f2040a5d283781e93bcccf6144621d846cb7
\ No newline at end of file
+60e14915e6c84da7644178b21e76d7c272506ed1f5e6a5513229215a59c4a1a4
\ No newline at end of file