Pass a config instance into movefile() to avoid dependence on global variables.

svn path=/main/trunk/; revision=3733

diff --git a/bin/emerge b/bin/emerge
index 716e51112e56dd9bfc1b8620872dd658428090e1..8b42d65b063fd22800e5c1da110fb440c45d9c1b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2751,7 +2751,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                        try:
                                if tmpservertimestampfile is not None:
                                        portage.movefile(tmpservertimestampfile,
-                                               servertimestampfile)
+                                               servertimestampfile, mysettings=settings)
                        except SystemExit, e:
                                raise
                        except Exception, e: