From 2b384bcfca2a9e6d80b9a564445b010407f1a9a2 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 19 Mar 2020 11:12:31 +0100 Subject: [PATCH] more specific validations of previous fix --- .../global/publish/integrate_master_version.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pype/plugins/global/publish/integrate_master_version.py b/pype/plugins/global/publish/integrate_master_version.py index 4600a95aa4..0eba275407 100644 --- a/pype/plugins/global/publish/integrate_master_version.py +++ b/pype/plugins/global/publish/integrate_master_version.py @@ -202,7 +202,7 @@ class IntegrateMasterVersion(pyblish.api.InstancePlugin): repre_name_low = repre["name"].lower() archived_repres_by_name[repre_name_low] = repre - backup_master_publish_dir = str(master_publish_dir) + backup_master_publish_dir = None if os.path.exists(master_publish_dir): backup_master_publish_dir = master_publish_dir + ".BACKUP" max_idx = 10 @@ -402,11 +402,17 @@ class IntegrateMasterVersion(pyblish.api.InstancePlugin): ) # Remove backuped previous master - if os.path.exists(backup_master_publish_dir): + if ( + backup_master_publish_dir is not None and + os.path.exists(backup_master_publish_dir) + ): shutil.rmtree(backup_master_publish_dir) except Exception: - if os.path.exists(backup_master_publish_dir): + if ( + backup_master_publish_dir is not None and + os.path.exists(backup_master_publish_dir) + ): os.rename(backup_master_publish_dir, master_publish_dir) self.log.error(( "!!! Creating of Master version failed."