commit f445495fe9f4c32aa32d05612df0a596e57819e6
author Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> Tue Aug 02 14:19:30 2022 +0900
committer GitHub <noreply@github.com> Tue Aug 02 14:19:30 2022 +0900
tree 54935d679ea5f72a67b412d815d6cee2c590aa2a
parent 599eed3d7b13ec066d38c69a5067b33c58058fb0
parent 7c47112d79f8ee0f637b3ee597657db2f047f0ea

Merge pull request #19 from apache/abderrahim/cargo-fix

{git,cargo}: fix set_ref following the latest buildstream changes

src/buildstream_plugins/sources/cargo.py

diff --git a/src/buildstream_plugins/sources/cargo.py b/src/buildstream_plugins/sources/cargo.py
index fb143ac..268f624 100644
--- a/src/buildstream_plugins/sources/cargo.py
+++ b/src/buildstream_plugins/sources/cargo.py
@@ -375,7 +375,7 @@
 
     def set_ref(self, ref, node):
         node["ref"] = ref
-        self._recompute_crates(ref)
+        self._recompute_crates(node.get_sequence("ref"))
 
     def track(self, *, previous_sources_dir):
         new_ref = []

src/buildstream_plugins/sources/git.py

diff --git a/src/buildstream_plugins/sources/git.py b/src/buildstream_plugins/sources/git.py
index fb8a8a0..13c5fdf 100644
--- a/src/buildstream_plugins/sources/git.py
+++ b/src/buildstream_plugins/sources/git.py
@@ -827,14 +827,14 @@
             node["ref"] = self.mirror.ref = actual_ref
             self.mirror.tags = tags
             if tags:
-                node["tags"] = []
-                for tag, commit_ref, annotated in tags:
-                    data = {
+                node["tags"] = [
+                    {
                         "tag": tag,
                         "commit": commit_ref,
                         "annotated": annotated,
                     }
-                    node["tags"].append(data)
+                    for tag, commit_ref, annotated in tags
+                ]
             else:
                 if "tags" in node:
                     del node["tags"]