From 7be715fce4e922e0b257ff8824f7d575c4d8e3e4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 24 Jun 2007 18:58:42 +0000 Subject: For bug #180706, add sorting and a trailing newline in the rest of the cases where the world file is written. svn path=/main/trunk/; revision=6999 --- pym/emerge/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym/emerge/__init__.py') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index c9e2e6e54..b2fb55c86 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3072,7 +3072,7 @@ class MergeTask(object): "--pretend" in self.myopts): portage.write_atomic( os.path.join(self.target_root, portage.WORLD_FILE), - "\n".join(myfavdict.values())) + "\n".join(sorted(myfavdict.values())) + "\n") mtimedb["resume"]["mergelist"]=mymergelist[:] mtimedb.commit() -- cgit v1.2.3-1-g7c22