From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 20 Aug 2006 07:47:20 +0000 (-0000)
Subject: Don't bother to lock CONFIG_MEMORY_FILE since writedict is atomic anyway.
X-Git-Tag: v2.1.1~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50ad5109b9091e065f483118b24e94a40c8f8d74;p=portage.git

Don't bother to lock CONFIG_MEMORY_FILE since writedict is atomic anyway.

svn path=/main/trunk/; revision=4313
---

diff --git a/pym/portage.py b/pym/portage.py
index 15bf66820..c466b7228 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5990,7 +5990,8 @@ class dblink:
 		self.updateprotect()
 
 		#if we have a file containing previously-merged config file md5sums, grab it.
-		cfgfiledict = grabdict(os.path.join(destroot, CONFIG_MEMORY_FILE))
+		conf_mem_file = os.path.join(destroot, CONFIG_MEMORY_FILE)
+		cfgfiledict = grabdict(conf_mem_file)
 		if self.settings.has_key("NOCONFMEM"):
 			cfgfiledict["IGNORE"]=1
 		else:
@@ -6059,10 +6060,8 @@ class dblink:
 			os.chown(my_private_path, os.getuid(), portage_gid)
 			os.chmod(my_private_path, 02770)
 
-		mylock = portage_locks.lockfile(
-			os.path.join(destroot, CONFIG_MEMORY_FILE), wantnewlockfile=1)
-		writedict(cfgfiledict, os.path.join(destroot, CONFIG_MEMORY_FILE))
-		portage_locks.unlockfile(mylock)
+		writedict(cfgfiledict, conf_mem_file)
+		del conf_mem_file
 
 		#do postinst script
 		a = doebuild(myebuild, "postinst", destroot, self.settings, use_cache=0,