From 4d40f4d3b7ef37ad0ee4d1040ac2792fe54084a6 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <vlorentz@softwareheritage.org>
Date: Thu, 4 Apr 2019 20:46:15 +0200
Subject: [PATCH] Make snapshot_identifier add the cycle to the exception's
arguments when it detects one.
---
swh/model/identifiers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/swh/model/identifiers.py b/swh/model/identifiers.py
index 083efd45..e7508ebc 100644
--- a/swh/model/identifiers.py
+++ b/swh/model/identifiers.py
@@ -591,8 +591,8 @@ def snapshot_identifier(snapshot, *, ignore_unresolved=False):
if unresolved and not ignore_unresolved:
raise ValueError('Branch aliases unresolved: %s' %
- ', '.join('%s -> %s' % (name, target)
- for name, target in unresolved))
+ ', '.join('%s -> %s' % x for x in unresolved),
+ unresolved)
return identifier_to_str(hash_git_data(b''.join(lines), 'snapshot'))
--
GitLab