Merge remote-tracking branch 'fnaum/master'

# Conflicts: # src/rezplugins/build_process/local.py
AcademySoftwareFoundation · Feb 28, 2017 · e5644c8 · e5644c8
2 parents 80c8ef6 + 6451eaa
commit e5644c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py
@@ -1,7 +1,7 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.5.1"
+_rez_version = "2.5.2"
 
 
 # Copyright 2013-2016 Allan Johns.

diff --git a/src/rezplugins/build_process/local.py b/src/rezplugins/build_process/local.py
@@ -111,18 +111,19 @@ def _build_variant_base(self, variant, build_type, install_path=None,
             variant_build_path = os.path.join(variant_build_path, variant.subpath)
             variant_install_path = os.path.join(variant_install_path, variant.subpath)
 
-        # inform package repo that a variant is about to be built/installed
-        pkg_repo = package_repository_manager.get_repository(install_path)
-        pkg_repo.pre_variant_install(variant.resource)
-
         # create directories (build, install)
         if clean and os.path.exists(variant_build_path):
             shutil.rmtree(variant_build_path)
 
         safe_makedirs(variant_build_path)
 
         if install:
-            safe_makedirs(variant_build_path)
+            # inform package repo that a variant is about to be built/installed
+            pkg_repo = package_repository_manager.get_repository(install_path)
+            pkg_repo.pre_variant_install(variant.resource)
+
+            if os.path.exists(variant_install_path):
+                safe_makedirs(variant_install_path)
 
         # create build environment
         context, rxt_filepath = self.create_build_context(