Merged from trunk -r13988:13998
authorFabian Groffen <grobian@gentoo.org>
Fri, 14 Aug 2009 20:51:39 +0000 (20:51 -0000)
committerFabian Groffen <grobian@gentoo.org>
Fri, 14 Aug 2009 20:51:39 +0000 (20:51 -0000)
commit5f209df762d039d15e330099db7153123b1b24f6
treeaf4c40e9c5a41a7f25456634f1a63bac83fe35db
parenta1e751fe618c753fbfce15715f726aeedcb05678
   Merged from trunk -r13988:13998

   | 13989   | Bug #280460 - Wrap portage.os with unicode encode/decode     |
   | zmedico | wrappers.                                                    |

   | 13990   | Fix unicode support for compatibility with the new wrapped   |
   | zmedico | os module, and use _unicode_decode() and _unicode_encode()   |
   |         | where appropriate.                                           |

   | 13991   | Fix breakage from previous commit.                           |
   | zmedico |                                                              |

   | 13992   | Avoid using the wrapped os.read(), in order to avoid         |
   | zmedico | differing behavior between python-2.x (with wrapper) and     |
   |         | py3k (without wrapper). This sort of mismatch only applies   |
   |         | to os functions that return raw bytes under py3k, rather     |
   |         | than unicode.                                                |

   | 13993   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13994   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13995   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13996   | Update imports to import portage.os and portage.shutil (with |
   | zmedico | unicode wrappers), and use _unicode_encode() where           |
   |         | appropriate.                                                 |

   | 13997   | Add ACCEPT_PROPERTIES variable which has default value * and |
   | volkmar | can be set in make.conf or /etc/portage/package.properties.  |
   |         | If ACCEPT_PROPERTIES doesn't match ebuild PROPERTIES, the    |
   |         | ebuild is masked.                                            |

   | 13998   | Temporarily delete the os and shutil imports, to ensure that |
   | zmedico | only the wrapped versions are imported by portage internals. |

svn path=/main/branches/prefix/; revision=14043
65 files changed:
bin/archive-conf
bin/clean_locks
bin/dispatch-conf
bin/ebuild
bin/egencache
bin/emaint
bin/emerge
bin/env-update
bin/fixpackages
bin/glsa-check
bin/isolated-functions.sh
bin/portageq
bin/quickpkg
bin/regenworld
bin/repoman
pym/_emerge/Binpkg.py
pym/_emerge/BinpkgFetcher.py
pym/_emerge/BinpkgPrefetcher.py
pym/_emerge/BinpkgVerifier.py
pym/_emerge/BlockerCache.py
pym/_emerge/BlockerDB.py
pym/_emerge/CompositeTask.py
pym/_emerge/EbuildBinpkg.py
pym/_emerge/EbuildBuild.py
pym/_emerge/EbuildBuildDir.py
pym/_emerge/EbuildExecuter.py
pym/_emerge/EbuildFetcher.py
pym/_emerge/EbuildFetchonly.py
pym/_emerge/EbuildMerge.py
pym/_emerge/EbuildMetadataPhase.py
pym/_emerge/EbuildPhase.py
pym/_emerge/EbuildProcess.py
pym/_emerge/FakeVartree.py
pym/_emerge/JobStatusDisplay.py
pym/_emerge/MergeListItem.py
pym/_emerge/MetadataRegen.py
pym/_emerge/MiscFunctionsProcess.py
pym/_emerge/Package.py
pym/_emerge/PackageArg.py
pym/_emerge/PackageUninstall.py
pym/_emerge/PackageVirtualDbapi.py
pym/_emerge/PipeReader.py
pym/_emerge/RepoDisplay.py
pym/_emerge/Scheduler.py
pym/_emerge/SpawnProcess.py
pym/_emerge/SubProcess.py
pym/_emerge/TaskSequence.py
pym/_emerge/UninstallFailure.py
pym/_emerge/actions.py
pym/_emerge/changelog.py
pym/_emerge/clear_caches.py
pym/_emerge/create_world_atom.py
pym/_emerge/depgraph.py
pym/_emerge/emergelog.py
pym/_emerge/getloadavg.py
pym/_emerge/is_valid_package_atom.py
pym/_emerge/main.py
pym/_emerge/search.py
pym/_emerge/show_invalid_depstring_notice.py
pym/_emerge/unmerge.py
pym/_emerge/visible.py
pym/portage/__init__.py
pym/portage/_selinux.py
pym/portage/dbapi/porttree.py
pym/portage/dbapi/vartree.py