From df0b6848690be8b5cc31acc6c498e143f7e69210 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 5 Sep 2018 19:30:25 +0200 Subject: [PATCH] Correctly find the version of a dependency. We have separated the version in two separated dicts since a long time :/ --- kiwixbuild/dependencies/base.py | 5 ++++- travis/compile_all.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 1c04f74..e35c59f 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -24,7 +24,10 @@ class Dependency(metaclass=_MetaDependency): @classmethod def version(cls): - return base_deps_versions.get(cls.name, None) + if cls.name in base_deps_versions: + return base_deps_versions[cls.name] + else: + return main_project_versions.get(cls.name, None) @classmethod def full_name(cls): diff --git a/travis/compile_all.py b/travis/compile_all.py index 463b949..b26aeb4 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -359,9 +359,9 @@ if make_release and PLATFORM == 'native_dyn': except FileExistsError: pass - in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format( - target, - main_project_versions[target]) + full_target_name = "{}-{}".format(target, main_project_versions[target]) + in_file = BASE_DIR/full_target_name/'meson-dist'/'{}.tar.xz'.format( + full_target_name) if in_file.exists(): shutil.copy(str(in_file), str(out_dir/target)) elif PLATFORM == 'native_static':