Update for deprecation of hex in pygit2 1.15.0 and above (bsc#1230642)

Co-authored-by: David Murphy <[email protected]>
openSUSE · Jan 27, 2025 · 40a7163 · 40a7163
1 parent a9505da
commit 40a7163
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py
@@ -1660,7 +1660,7 @@ def checkout(self, fetch_on_fail=True):
             return None
 
         try:
-            head_sha = self.peel(local_head).hex
+            head_sha = str(self.peel(local_head).id)
         except AttributeError:
             # Shouldn't happen, but just in case a future pygit2 API change
             # breaks things, avoid a traceback and log an error.
@@ -1721,7 +1721,10 @@ def _perform_checkout(checkout_ref, branch=True):
                     self.repo.create_reference(local_ref, pygit2_id)
 
                 try:
-                    target_sha = self.peel(self.repo.lookup_reference(remote_ref)).hex
+                    target_sha = str(
+                        self.peel(self.repo.lookup_reference(remote_ref)).id
+                    )
+
                 except KeyError:
                     log.error(
                         "pygit2 was unable to get SHA for %s in %s remote '%s'",
@@ -1802,10 +1805,11 @@ def _perform_checkout(checkout_ref, branch=True):
                 else:
                     try:
                         # If no AttributeError raised, this is an annotated tag
-                        tag_sha = tag_obj.target.hex
+                        tag_sha = str(tag_obj.target.id)
+
                     except AttributeError:
                         try:
-                            tag_sha = tag_obj.hex
+                            tag_sha = str(tag_obj.id)
                         except AttributeError:
                             # Shouldn't happen, but could if a future pygit2
                             # API change breaks things.
@@ -2145,7 +2149,7 @@ def find_file(self, path, tgt_env):
                 blob = None
                 break
         if isinstance(blob, pygit2.Blob):
-            return blob, blob.hex, mode
+            return blob, str(blob.id), mode
         return None, None, None
 
     def get_tree_from_branch(self, ref):