From a484bfc68ed2b0ef074661b6e2a7b6a3f9e9e94c Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sat, 22 Oct 2022 14:31:55 +0300
Subject: [PATCH] fix propery validation
---
BuildBotLib/make.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py
index fb3fe03..9be5dec 100644
--- a/BuildBotLib/make.py
+++ b/BuildBotLib/make.py
@@ -34,10 +34,12 @@ class Make(BaseModule):
return step.getProperty('deploy')
def isCopyArtefact(self, step):
- return len(str(step.getProperty('copyCustomArtifact'))) > 0
+ val = step.getProperty('copyCustomArtifact')
+ return type(val) == str and len(val) > 0
def isCopyCustomFolder(self, step):
- return len(str(step.getProperty('copyCustomFolder'))) > 0
+ val = step.getProperty('copyCustomFolder')
+ return type(val) == str and len(val) > 0
def isRelease(self, step):
return step.getProperty('release') and step.getProperty('stopOnErrors')
@@ -338,8 +340,8 @@ class Make(BaseModule):
masterdest=self.getWraper(self.destDir),
url=self.getWraper(self.destDirUrl),
doStepIf=self.getWraper(self.isCopyCustomFolder),
- name='copy extra artefact file',
- description='copy extra artefact file',
+ name='copy extra artefact files',
+ description='copy extra artefact files (DirectoryUpload)',
)
)
@@ -352,7 +354,7 @@ class Make(BaseModule):
url=self.getWraper(self.destDirUrl),
doStepIf=self.getWraper(self.isCopyArtefact),
name='copy custom artifact file',
- description='copy custom artifact file',
+ description='copy custom artifact file (FileUpload)',
)
)