From 8b2a129066ee1453338155f0082cc5bc62675b9b Mon Sep 17 00:00:00 2001 From: aardschok Date: Fri, 4 Aug 2017 12:07:57 +0200 Subject: [PATCH] added version validation for assumed template data --- colorbleed/plugins/maya/publish/collect_look.py | 1 - colorbleed/plugins/publish/integrate.py | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/colorbleed/plugins/maya/publish/collect_look.py b/colorbleed/plugins/maya/publish/collect_look.py index 73deec968b..4b1a16b194 100644 --- a/colorbleed/plugins/maya/publish/collect_look.py +++ b/colorbleed/plugins/maya/publish/collect_look.py @@ -127,7 +127,6 @@ class CollectLook(pyblish.api.InstancePlugin): # Collect textures, resources = [self.collect_resource(n) for n in files] instance.data["resources"] = resources - # pprint.pprint(resources) # Log a warning when no relevant sets were retrieved for the look. if not instance.data["lookData"]["sets"]: diff --git a/colorbleed/plugins/publish/integrate.py b/colorbleed/plugins/publish/integrate.py index 2c21866514..9a1c81df68 100644 --- a/colorbleed/plugins/publish/integrate.py +++ b/colorbleed/plugins/publish/integrate.py @@ -109,7 +109,17 @@ class IntegrateAsset(pyblish.api.InstancePlugin): if latest_version is not None: next_version += latest_version["name"] - self.log.debug("Next version: %i" % next_version) + self.log.info("Verifying version from assumed destination") + + assumed_data = instance.data["assumedTemplateData"] + assumed_version = assumed_data["version"] + if assumed_version != next_version: + raise AttributeError("Assumed version 'v{0:03d}' does not match" + "next version in database " + "('v{1:03d}')".format(assumed_version, + next_version)) + + self.log.debug("Next version: v{0:03d}".format(next_version)) version_data = self.create_version_data(context, instance) version = self.create_version(subset=subset,