Merged from trunk 6981:6990
+------------------------------------------------------------------------+
| 6982 | Fix check_config_instance() weirdness when the ebuild |
| zmedico | command reloads the portage module. |
|---------+--------------------------------------------------------------|
| 6983 | For bug #182964, replace os.rename() with portage.movefile() |
| zmedico | in cases where the parent directory might change. |
|---------+--------------------------------------------------------------|
| 6985 | Provide a default value for PORTAGE_BINPKG_TMPFILE in case |
| zmedico | the package phase is called by the ebuild command. |
|---------+--------------------------------------------------------------|
| 6986 | Always unlink the .installed flag prior to merge since |
| zmedico | portage.movefile() never leaves intact. |
|---------+--------------------------------------------------------------|
| 6987 | Make the fix for bug #139600 slightly less icky by grabbing |
| zmedico | the ACCEPT_KEYWORDS through mysettings.configdict[backupenv] |
| | instead of directly through os.environ. |
|---------+--------------------------------------------------------------|
| 6988 | Fix column alignment in unmerge output. |
| zmedico | |
|---------+--------------------------------------------------------------|
| 6989 | Fix typo. |
| zmedico | |
|---------+--------------------------------------------------------------|
| 6990 | Handle 'Permission denied' errors that can occur if the |
| zmedico | current user isn't allowed to access PRIVATE_PATH. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6995
projects / portage.git / commit