Merged from trunk 6995:7031

   Merged from trunk 6995:7031

   +------------------------------------------------------------------------+
   | 6996    | Fix more typos from r6988.                                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6999    | For bug #180706, add sorting and a trailing newline in the   |
   | zmedico | rest of the cases where the world file is written.           |
   |---------+--------------------------------------------------------------|
   | 7002    | Fix broken base_uri handling for old-style binhosts in       |
   | zmedico | binarytree.gettbz2().                                        |
   |---------+--------------------------------------------------------------|
   | 7004    | Update the FETCHCOMMAND docs to indicate that the command    |
   | zmedico | should be +written to place the fetched file at              |
   |         | ${DISTDIR}/${FILE}.                                          |
   |---------+--------------------------------------------------------------|
   | 7005    | Clarify RESUMECOMMAND requirements.                          |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7008    | Use a set to optimize containment lookups.                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7011    | Remove unused imports and unnecessary dict.keys() call.      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7012    | Fix binarytree.isremote() to be consistent with              |
   | zmedico | binarytree.gettbz2() logic wrt partially downloaded files.   |
   |---------+--------------------------------------------------------------|
   | 7014    | Clean up file_get() to use shlex, varexpand, and spawn.      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7016    | For bug #175891, support ${FETCHCOMMAND}_${PROTOCOL} in      |
   | zmedico | binarytree.gettbz2().                                        |
   |---------+--------------------------------------------------------------|
   | 7018    | Fix resume logic in binarytree.gettbz2().                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7019    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7023    | For bug #175891, add sftp protocol support via the paramiko  |
   | zmedico | library.                                                     |
   |---------+--------------------------------------------------------------|
   | 7024    | Fix file_get_lib() so it behaves the same way with sftp as   |
   | zmedico | it does with other protocols.                                |
   |---------+--------------------------------------------------------------|
   | 7025    | Allow SystemExit through as usual.                           |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7027    | Don't use urljoin() in binarytree.gettbz2() since it doesn't |
   | zmedico | work correctly wih unrecognized protocols like sftp.         |
   |---------+--------------------------------------------------------------|
   | 7029    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7031    | For bug #142473, add 4 color classes corresponding to        |
   | zmedico | combinations of world/merge/nomerge attributes of each       |
   |         | package.                                                     |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7033