petronny
/
gcp
forked from mcy/gcp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bad closure when a file already exists

This commit is contained in:
Goffi 2010-09-30 16:44:52 +08:00
parent 7e6275ab07
commit 3df4c89e01
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcp
View File

@ -308,6 +308,10 @@ class GCP():
dest_file = self.__filename_fix(os.path.join(dest_path,filename),options) dest_file = self.__filename_fix(os.path.join(dest_path,filename),options)
if os.path.exists(dest_file) and not options.force: if os.path.exists(dest_file) and not options.force:
warning (_("File [%s] already exists, skipping it !") % dest_file.decode('utf-8','replace')) warning (_("File [%s] already exists, skipping it !") % dest_file.decode('utf-8','replace'))
self.journal.copyFailed()
self.journal.error("already exists")
self.journal.closeFile()
source_fd.close()
return True return True
try: try:
dest_fd = open(dest_file, 'wb') dest_fd = open(dest_file, 'wb')
@ -321,7 +325,7 @@ class GCP():
gobject.io_add_watch(source_fd,gobject.IO_IN,self._copyFile, gobject.io_add_watch(source_fd,gobject.IO_IN,self._copyFile,
(dest_fd, options), priority=gobject.PRIORITY_DEFAULT) (dest_fd, options), priority=gobject.PRIORITY_DEFAULT)
if not self.progress: if not self.progress:
info(_("COPYING %(source)s ==> %(dest)s") % {"source":source_path.decode('utf-8','replace'), info(_("COPYING %(source)s ==> %(dest)s") % {"source":source_file.decode('utf-8','replace'),
"dest":dest_file.decode('utf-8','replace')}) "dest":dest_file.decode('utf-8','replace')})
return True return True
else: else: