diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-08-28 23:12:52 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-28 23:12:52 -0700 |
| commit | 0fb60699ebe51fa998a2d661ecda2c7e021f5d30 (patch) | |
| tree | 0ce407c382c5dd088ac69a985cb0a268299ce545 /pym/portage/dbapi/vartree.py | |
| parent | python3.2 fixes: ResourceWarning: unclosed file (diff) | |
| download | portage-0fb60699ebe51fa998a2d661ecda2c7e021f5d30.tar.gz portage-0fb60699ebe51fa998a2d661ecda2c7e021f5d30.tar.bz2 portage-0fb60699ebe51fa998a2d661ecda2c7e021f5d30.zip | |
env_update: add minimal EPREFIX support
This takes EPREFIX from the env argument and uses it when joining all
paths. Also, ldconfig calls are disabled when EPREFIX is non-empty,
since it's inappropriate to update the global /etc/ld.so.cache in this
case.
Diffstat (limited to 'pym/portage/dbapi/vartree.py')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 6e49f38f8..6281f7ee5 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1845,7 +1845,7 @@ class dblink(object): try: env_update(target_root=self.settings['ROOT'], prev_mtimes=ldpath_mtimes, - contents=contents, env=self.settings.environ(), + contents=contents, env=self.settings, writemsg_level=self._display_merge) finally: self.vartree.dbapi._fs_unlock() @@ -3817,7 +3817,7 @@ class dblink(object): #update environment settings, library paths. DO NOT change symlinks. env_update(makelinks=(not downgrade), target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes, - contents=contents, env=self.settings.environ(), + contents=contents, env=self.settings, writemsg_level=self._display_merge) finally: self.vartree.dbapi._fs_unlock() |