Merged from trunk -r15770:15780
authorFabian Groffen <grobian@gentoo.org>
Tue, 9 Mar 2010 11:27:52 +0000 (11:27 -0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 9 Mar 2010 11:27:52 +0000 (11:27 -0000)
commit5ee2b5ee2aae60137506fdb4c5795eb95e2dcf7b
tree035067d0d65a54ae0e0a2d623c1002cfc63322d4
parentc6dad2634dae50a15d97babc4411e0d8bdd0765e
   Merged from trunk -r15770:15780

   | 15771   | Add copyright header.                                        |
   | zmedico |                                                              |

   | 15775   | Escape hyphens.                                              |
   | zmedico |                                                              |

   | 15776   | Clean up/sync docs for emerge --sync, and add a note about   |
   | zmedico | PORTAGE_SYNC_STALE.                                          |

   | 15777   | Move --update from the actions to the options section.       |
   | zmedico |                                                              |

   | 15778   | When portage upgrades or downgrades itself, preload lazily   |
   | zmedico | referenced portage submodules into memory so that imports    |
   |         | won't fail later.                                            |

svn path=/main/branches/prefix/; revision=15798
man/emerge.1
pym/_emerge/help.py
pym/_emerge/sync/__init__.py
pym/portage/dbapi/vartree.py
pym/portage/proxy/lazyimport.py