diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-24 18:58:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-24 18:58:42 +0000 |
| commit | 7be715fce4e922e0b257ff8824f7d575c4d8e3e4 (patch) | |
| tree | f1bdf66eac265c9cdb6bc9810b9938113ba4e2c6 | |
| parent | 8428f4e437a1b24e143e371b74bfd89c6c1f369a (diff) | |
| download | portage-7be715fce4e922e0b257ff8824f7d575c4d8e3e4.tar.gz portage-7be715fce4e922e0b257ff8824f7d575c4d8e3e4.tar.bz2 portage-7be715fce4e922e0b257ff8824f7d575c4d8e3e4.zip | |
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
| -rwxr-xr-x | bin/emaint | 3 | ||||
| -rwxr-xr-x | bin/regenworld | 3 | ||||
| -rw-r--r-- | pym/emerge/__init__.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/bin/emaint b/bin/emaint index 1c179df10..d13827ba5 100755 --- a/bin/emaint +++ b/bin/emaint @@ -69,7 +69,8 @@ class WorldHandler(object): self._check_world(onProgress) errors = [] try: - portage.write_atomic(self.world_file, "\n".join(self.okay)) + portage.write_atomic(self.world_file, + "\n".join(sorted(self.okay)) + "\n") except portage.exception.PortageException: errors.append(self.world_file + " could not be opened for writing") return errors diff --git a/bin/regenworld b/bin/regenworld index ebac4a591..601653406 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -92,4 +92,5 @@ for mykey in biglist: print "add to world:",myfavkey worldlist.append(myfavkey) -portage.write_atomic(os.path.join("/", portage.WORLD_FILE), "\n".join(worldlist)) +portage.write_atomic(os.path.join("/", portage.WORLD_FILE), + "\n".join(sorted(worldlist)) + "\n") 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() |