Skip to content

Commit

Permalink
handle several licenses in a package (#4817)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgsogo authored and memsharded committed Mar 25, 2019
1 parent 832fd8c commit 68f8d49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions conans/client/graph/grapher.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ def graph(self):
("author", conanfile.author),
("topics", str(conanfile.topics))]:
if data:
if isinstance(data, (tuple, list)):
data = ', '.join(data)
data = data.replace("'", '"')
fulllabel.append("<li><b>%s</b>: %s</li>" % (name, data))

Expand Down
2 changes: 1 addition & 1 deletion conans/test/functional/configuration/client_certs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get(self, _, **kwargs):
tools.save(client.cache.client_cert_key_path, "Fake key")
client.init_dynamic_vars()
self.assertEqual(client.requester.get("url"), (client.cache.client_cert_path,
client.cache.client_cert_key_path))
client.cache.client_cert_key_path))

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

0 comments on commit 68f8d49

Please sign in to comment.