From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Jul 2006 09:16:02 +0000 (-0000)
Subject: Pass a config instance into movefile() to avoid dependence on global variables.
X-Git-Tag: v2.1.1~312
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f340b2ac87f33342a3fba93576f264303f2ea445;p=portage.git

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 716e51112..8b42d65b0 100755
--- 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: