Skip to content

Commit 0924046

Browse files
committed
Fix a few more Windows issues.
1 parent 74b8dfc commit 0924046

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

gns3/modules/iou/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ def setSettings(self, settings):
257257
if server.isLocal():
258258
params.update({"working_dir": self._working_dir})
259259
else:
260-
del params["iouyap"] # do not send iouyap path to remote servers
260+
if "iouyap" in params:
261+
del params["iouyap"] # do not send iouyap path to remote servers
261262
project_name = os.path.basename(self._working_dir)
262263
if project_name.endswith("-files"):
263264
project_name = project_name[:-6]
@@ -284,7 +285,8 @@ def _sendSettings(self, server):
284285
if server.isLocal():
285286
params.update({"working_dir": self._working_dir})
286287
else:
287-
del params["iouyap"] # do not send iouyap path to remote servers
288+
if "iouyap" in params:
289+
del params["iouyap"] # do not send iouyap path to remote servers
288290
project_name = os.path.basename(self._working_dir)
289291
if project_name.endswith("-files"):
290292
project_name = project_name[:-6]

gns3/utils/process_files_thread.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ def run(self):
9292
else:
9393
shutil.copy2(source_file, destination_file)
9494
except EnvironmentError as e:
95-
if self._move:
96-
self.error.emit("Could not move file to {}: {}".format(destination_file, str(e)))
97-
else:
98-
self.error.emit("Could not copy file to {}: {}".format(destination_file, str(e)))
95+
pass # FIXME
96+
# if self._move:
97+
# self.error.emit("Could not move file to {}: {}".format(destination_file, str(e)))
98+
# else:
99+
# self.error.emit("Could not copy file to {}: {}".format(destination_file, str(e)))
99100
return
100101
copied += 1
101102
# update the progress made

0 commit comments

Comments
 (0)