summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cobbler/action_sync.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index e6bce25..47586d1 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -960,8 +960,11 @@ class BootSync:
def copyfile(self,src,dst):
try:
return shutil.copyfile(src,dst)
- except IOError, ioe:
- raise CX(_("Error copying %(src)s to %(dst)s") % { "src" : src, "dst" : dst})
+ except:
+ if not os.path.samefile(src,dst):
+ # accomodate for the possibility that we already copied
+ # the file as a symlink/hardlink
+ raise CX(_("Error copying %(src)s to %(dst)s") % { "src" : src, "dst" : dst})
def rmfile(self,path):
try: