Skip to content

Commit 68f8d49

Browse files
jgsogomemsharded
authored andcommitted
handle several licenses in a package (#4817)
1 parent 832fd8c commit 68f8d49

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

conans/client/graph/grapher.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ def graph(self):
6363
("author", conanfile.author),
6464
("topics", str(conanfile.topics))]:
6565
if data:
66+
if isinstance(data, (tuple, list)):
67+
data = ', '.join(data)
6668
data = data.replace("'", '"')
6769
fulllabel.append("<li><b>%s</b>: %s</li>" % (name, data))
6870

conans/test/functional/configuration/client_certs_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def get(self, _, **kwargs):
2929
tools.save(client.cache.client_cert_key_path, "Fake key")
3030
client.init_dynamic_vars()
3131
self.assertEqual(client.requester.get("url"), (client.cache.client_cert_path,
32-
client.cache.client_cert_key_path))
32+
client.cache.client_cert_key_path))
3333

3434
# assert that the cacert file is created
3535
self.assertTrue(os.path.exists(client.cache.cacert_path))

0 commit comments

Comments
 (0)