mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-23 23:38:21 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
65103e9332
@ -135,7 +135,7 @@ class Config(object):
|
||||
Read the configuration files.
|
||||
"""
|
||||
|
||||
parsed_files = self._config.read(self._files)
|
||||
parsed_files = self._config.read(self._files, encoding="utf-8")
|
||||
if not parsed_files:
|
||||
log.warning("No configuration file could be found or read")
|
||||
else:
|
||||
|
@ -36,8 +36,9 @@ class UploadHandler:
|
||||
try:
|
||||
for root, _, files in os.walk(UploadHandler.image_directory()):
|
||||
for filename in files:
|
||||
image_file = os.path.join(root, filename)
|
||||
uploaded_files.append(image_file)
|
||||
if not filename.startswith("."):
|
||||
image_file = os.path.join(root, filename)
|
||||
uploaded_files.append(image_file)
|
||||
except OSError:
|
||||
pass
|
||||
iourc_path = os.path.join(os.path.expanduser("~/"), ".iourc")
|
||||
|
Loading…
Reference in New Issue
Block a user