diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-14 07:49:30 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-14 07:49:30 -0700 |
| commit | 25dae8949181fd3db25cabbdb9b95dfdd04c313c (patch) | |
| tree | 5c9a5dde938f435c25fb50aa91f492ca7e2b55e6 /pym/portage | |
| parent | 345e3ace7dd2885f95a6b022c2eefa110eb48c8e (diff) | |
| download | portage-25dae8949181fd3db25cabbdb9b95dfdd04c313c.tar.gz portage-25dae8949181fd3db25cabbdb9b95dfdd04c313c.tar.bz2 portage-25dae8949181fd3db25cabbdb9b95dfdd04c313c.zip | |
Make EbuildBuildDir use the PORTAGE_BUILDDIR variable instead of the
dir_path attribute.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 1 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 1 | ||||
| -rw-r--r-- | pym/portage/tests/ebuild/test_ipc_daemon.py | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c90dbbd21..80d67fb87 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1520,7 +1520,6 @@ class dblink(object): try: if myebuildpath: builddir_lock = EbuildBuildDir( - dir_path=self.settings['PORTAGE_BUILDDIR'], scheduler=(scheduler or PollScheduler().sched_iface), settings=self.settings) builddir_lock.lock() diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index dff9b881f..4c266222c 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -618,7 +618,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if not parallel_fetchonly and \ mydo not in ('digest', 'fetch', 'help', 'manifest'): builddir_lock = EbuildBuildDir( - dir_path=mysettings['PORTAGE_BUILDDIR'], scheduler=PollScheduler().sched_iface, settings=mysettings) builddir_lock.lock() mystatus = prepare_build_dirs(myroot, mysettings, cleanup) diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py index c4eb55b0d..4c9a614f8 100644 --- a/pym/portage/tests/ebuild/test_ipc_daemon.py +++ b/pym/portage/tests/ebuild/test_ipc_daemon.py @@ -39,7 +39,7 @@ class IpcDaemonTestCase(TestCase): env['PORTAGE_BUILDDIR'] = os.path.join(tmpdir, 'cat', 'pkg-1') task_scheduler = TaskScheduler(max_jobs=2) - build_dir = EbuildBuildDir(dir_path=env['PORTAGE_BUILDDIR'], + build_dir = EbuildBuildDir( scheduler=task_scheduler.sched_iface, settings=env) build_dir.lock() |