Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cura/util/resources.py3
-rwxr-xr-xpackage.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/Cura/util/resources.py b/Cura/util/resources.py
index 6c38576398..59592fb173 100644
--- a/Cura/util/resources.py
+++ b/Cura/util/resources.py
@@ -32,7 +32,8 @@ else:
def getPathForResource(dir, subdir, resource_name):
assert os.path.isdir(dir), "{p} is not a directory".format(p=dir)
path = os.path.normpath(os.path.join(dir, subdir, resource_name))
- assert os.path.isfile(path), "{p} is not a file.".format(p=path)
+ if not os.path.isfile(path):
+ return None
return path
def getPathForImage(name):
diff --git a/package.sh b/package.sh
index 728a7e86ca..1e8a2f1d91 100755
--- a/package.sh
+++ b/package.sh
@@ -19,7 +19,7 @@ BUILD_TARGET=${1:-none}
##Do we need to create the final archive
ARCHIVE_FOR_DISTRIBUTION=1
##Which version name are we appending to the final archive
-export BUILD_NAME=14.10-RC5
+export BUILD_NAME=14.10-RC6
TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
##Which versions of external programs to use