rms/gns3-gui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-gui.git synced 2026-05-17 00:46:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few more Windows issues.

Browse Source
This commit is contained in:
grossmj
2014-03-30 22:14:53 -06:00
parent 74b8dfc447
commit 09240461ab
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gns3/modules/iou/__init__.py
View File

@@ -257,7 +257,8 @@ class IOU(Module):
if server.isLocal():
params.update({"working_dir": self._working_dir})
else:
del params["iouyap"] # do not send iouyap path to remote servers
if "iouyap" in params:
del params["iouyap"] # do not send iouyap path to remote servers
project_name = os.path.basename(self._working_dir)
if project_name.endswith("-files"):
project_name = project_name[:-6]
@@ -284,7 +285,8 @@ class IOU(Module):
if server.isLocal():
params.update({"working_dir": self._working_dir})
else:
del params["iouyap"] # do not send iouyap path to remote servers
if "iouyap" in params:
del params["iouyap"] # do not send iouyap path to remote servers
project_name = os.path.basename(self._working_dir)
if project_name.endswith("-files"):
project_name = project_name[:-6]

9
gns3/utils/process_files_thread.py
View File

@@ -92,10 +92,11 @@ class ProcessFilesThread(QtCore.QThread):
else:
shutil.copy2(source_file, destination_file)
except EnvironmentError as e:
if self._move:
self.error.emit("Could not move file to {}: {}".format(destination_file, str(e)))
else:
self.error.emit("Could not copy file to {}: {}".format(destination_file, str(e)))
pass # FIXME
# if self._move:
# self.error.emit("Could not move file to {}: {}".format(destination_file, str(e)))
# else:
# self.error.emit("Could not copy file to {}: {}".format(destination_file, str(e)))
return
copied += 1
# update the progress made