Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Ondrej Samohel 2023-01-26 16:13:45 +01:00
commit 000389bab8
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
2 changed files with 4 additions and 6 deletions

View file

@ -146,10 +146,6 @@ hash = "b9950f5d2fa3720b52b8be55bacf5f56d33f9e029d38ee86534995f3d8d253d2"
url = "https://distribute.openpype.io/thirdparty/oiio_tools-2.2.20-linux-centos7.tgz"
hash = "3894dec7e4e521463891a869586850e8605f5fd604858b674c87323bf33e273d"
[openpype.thirdparty.oiio.darwin]
url = "https://distribute.openpype.io/thirdparty/oiio-2.2.0-darwin.tgz"
hash = "sha256:..."
[openpype.thirdparty.ocioconfig]
url = "https://distribute.openpype.io/thirdparty/OpenColorIO-Configs-1.0.2.zip"
hash = "4ac17c1f7de83465e6f51dd352d7117e07e765b66d00443257916c828e35b6ce"

View file

@ -130,8 +130,10 @@ def install_thirdparty(pyproject, openpype_root, platform_name):
_print("trying to get universal url for all platforms")
url = v.get("url")
if not url:
_print("cannot get url", 1)
sys.exit(1)
_print("cannot get url for all platforms", 1)
_print((f"Warning: {k} is not installed for current platform "
"and it might be missing in the build"), 1)
continue
else:
url = v.get(platform_name).get("url")
destination_path = destination_path / platform_name