Fix merge-induced error

This commit is contained in:
Jerry Seutter
2014-10-30 12:23:31 -06:00
parent e9850ee962
commit 2bbfefb5e1

View File

@@ -309,12 +309,20 @@ class UploadProjectThread(QThread):
zip_file.write(root, os.path.relpath(root, relroot))
for file in files:
filename = os.path.join(root, file)
if os.path.isfile(filename): # regular files only
if os.path.isfile(filename) and not self._should_exclude(filename): # regular files only
arcname = os.path.join(os.path.relpath(root, relroot), file)
zip_file.write(filename, arcname)
return output_filename
def _should_exclude(self, filename):
"""
Returns True if file should be excluded from zip of project files
:param filename:
:return: True if file should be excluded from zip, False otherwise
"""
return filename.endswith('.ghost')
def stop(self):
self.quit()