diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-20 08:21:16 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-20 08:21:16 -0700 |
commit | 7e9b615f92ef5af492b1147b92335dbdb844e343 (patch) | |
tree | ae090a3d552ab4f456b33c289e6c4a2e38d51905 /pym/portage/package | |
parent | faf8c92db945ab3aa4c003bc5b0faf9b0d9f7692 (diff) | |
download | portage-7e9b615f92ef5af492b1147b92335dbdb844e343.tar.gz portage-7e9b615f92ef5af492b1147b92335dbdb844e343.tar.bz2 portage-7e9b615f92ef5af492b1147b92335dbdb844e343.zip |
* Fix EROOT handling in various places in vartree.py. It should be
all fixed now, but needs testing.
* Remove unused root parameter in calls to dblink.isowner() and
_match_contents().
* Make doebuild_environment() and prepare_build_dirs() take keyword
arguments, and ignore unused parameters. Especially don't use
myroot parameters since they are confusing given EROOT support.
Diffstat (limited to 'pym/portage/package')
-rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 20 | ||||
-rw-r--r-- | pym/portage/package/ebuild/prepare_build_dirs.py | 10 |
2 files changed, 26 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index e606ac302..699fbc5bd 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -108,9 +108,22 @@ def _spawn_phase(phase, settings, actionmap=None, **kwargs): task_scheduler.run() return ebuild_phase.returncode -def doebuild_environment(myebuild, mydo, myroot, mysettings, - debug, use_cache, mydbapi): +def doebuild_environment(myebuild, mydo, myroot=None, settings=None, + debug=False, use_cache=None, db=None): + """ + The myroot and use_cache parameters are unused. + """ + myroot = None + use_cache = None + + if settings is None: + raise TypeError("settings argument is required") + + if db is None: + raise TypeError("db argument is required") + mysettings = settings + mydbapi = db ebuild_path = os.path.abspath(myebuild) pkg_dir = os.path.dirname(ebuild_path) @@ -276,7 +289,8 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, mydo in ('compile', 'config', 'configure', 'info', 'install', 'nofetch', 'postinst', 'postrm', 'preinst', 'prepare', 'prerm', 'setup', 'test', 'unpack'): - mykv,err1=ExtractKernelVersion(os.path.join(myroot, "usr/src/linux")) + mykv, err1 = ExtractKernelVersion( + os.path.join(mysettings['EROOT'], "usr/src/linux")) if mykv: # Regular source tree mysettings["KV"]=mykv diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index dc29eeeb8..3792800ac 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -18,8 +18,16 @@ from portage.output import colorize from portage.util import apply_recursive_permissions, \ apply_secpass_permissions, ensure_dirs, writemsg -def prepare_build_dirs(myroot, mysettings, cleanup): +def prepare_build_dirs(myroot=None, settings=None, cleanup=False): + """ + The myroot parameter is ignored. + """ + myroot = None + if settings is None: + raise TypeError("settings argument is required") + + mysettings = settings clean_dirs = [mysettings["HOME"]] # We enable cleanup when we want to make sure old cruft (such as the old |