movefile: avoid redundant string concatenations

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 70ecb6010e63a0cf1f48e42990428b4904672d73..c205fe93461899073dbff9f1900adb0fb4e317fd 100644 (file)
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -169,15 +169,16 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
        if renamefailed:
                didcopy=0
                if stat.S_ISREG(sstat[stat.ST_MODE]):
+                       dest_tmp = dest + "#new"
                        try: # For safety copy then move it over.
                                if selinux_enabled:
-                                       selinux.copyfile(src, dest + "#new")
-                                       _copyxattr(src, dest + "#new")
-                                       selinux.rename(dest + "#new", dest)
+                                       selinux.copyfile(src, dest_tmp)
+                                       _copyxattr(src, dest_tmp)
+                                       selinux.rename(dest_tmp, dest)
                                else:
-                                       shutil.copyfile(src, dest + "#new")
-                                       _copyxattr(src, dest + "#new")
-                                       os.rename(dest + "#new", dest)
+                                       shutil.copyfile(src, dest_tmp)
+                                       _copyxattr(src, dest_tmp)
+                                       os.rename(dest_tmp, dest)
                                didcopy=1
                        except SystemExit as e:
                                raise