diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-24 19:06:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-24 19:06:10 +0000 |
| commit | 4dd5d69f9902ae00534d430dc1351ee9ec165bb7 (patch) | |
| tree | bd6fb670a71868434bb0ca1d2cf0f26276bab269 /pym | |
| parent | 058a5fc1b8c757baf2981b0d21191950792a56f6 (diff) | |
| download | portage-4dd5d69f9902ae00534d430dc1351ee9ec165bb7.tar.gz portage-4dd5d69f9902ae00534d430dc1351ee9ec165bb7.tar.bz2 portage-4dd5d69f9902ae00534d430dc1351ee9ec165bb7.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage_update.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |