From 4dd5d69f9902ae00534d430dc1351ee9ec165bb7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 24 Jun 2007 19:06:10 +0000 Subject: sort the world file before writing it and ensure that it's terminated by a newline (bug #180706, trunk r6976 and r6999) svn path=/main/branches/2.1.2/; revision=7000 --- pym/portage_update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage_update.py b/pym/portage_update.py index c3746d34d..f1cf7c6e5 100644 --- a/pym/portage_update.py +++ b/pym/portage_update.py @@ -202,7 +202,8 @@ def update_config_files(config_root, protect, protect_mask, update_iter): sys.stdout.write("p") sys.stdout.flush() - write_atomic(os.path.join(config_root, WORLD_FILE), "\n".join(worldlist)) + worldlist.sort() + write_atomic(os.path.join(config_root, WORLD_FILE), "\n".join(worldlist)+"\n") protect_obj = ConfigProtect( config_root, protect, protect_mask) -- cgit v1.2.3-1-g7c22