diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index 57375f2..e7f93e2 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -77,7 +77,7 @@ else: pass def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, - hardlink_candidates=None, encoding=_encodings['fs']): + hardlink_candidates=None, encoding=_encodings['fs'], force_copy=False): """moves a file from src to dest, preserving all permissions and attributes; mtime will be preserved even when moving across filesystems. Returns mtime as integer on success and None on failure. mtime is expressed in seconds in Python <3.3 and nanoseconds in @@ -220,7 +220,7 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, renamefailed=1 if hardlinked: renamefailed = False - if not hardlinked and (selinux_enabled or sstat.st_dev == dstat.st_dev): + if not force_copy and not hardlinked and (selinux_enabled or sstat.st_dev == dstat.st_dev): try: if selinux_enabled: selinux.rename(src, dest)