diff options
| author | David James <davidjames@chromium.org> | 2013-02-24 19:32:50 -0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-02-24 20:18:14 -0800 |
| commit | 7746e11011f6dd1b730a1e8bb6897859073bb03c (patch) | |
| tree | 1bbb054e8c8abf578a8e43645c301147eabd3c3e /scripts/parallel_emerge.py | |
| parent | 665f45b6af9f04343fe016d8dccd00f55816e21e (diff) | |
| download | chromite-7746e11011f6dd1b730a1e8bb6897859073bb03c.tar.gz | |
Add Python 2.7 compatibility to parallel_emerge.
With Python 2.7, parallel_emerge fails with the below error:
Traceback (most recent call last):
...
File "/mnt/host/source/chromite/scripts/parallel_emerge.py", line 1663, in real_main
scheduler = EmergeQueue(deps_graph, emerge, deps.package_db, deps.show_output)
File "/mnt/host/source/chromite/scripts/parallel_emerge.py", line 1211, in __init__
args)
File "/usr/lib64/python2.7/multiprocessing/__init__.py", line 232, in Pool
return Pool(processes, initializer, initargs, maxtasksperchild)
File "/usr/lib64/python2.7/multiprocessing/pool.py", line 129, in __init__
raise ValueError("Number of processes must be at least 1")
ValueError: Number of processes must be at least 1
I've fixed this by updating parallel_emerge to ensure that the number of
processes is always at least one.
BUG=chromium-os:23031
TEST=./parallel_emerge -uDNvg world passes now
Change-Id: Icd3cbac29b7086bed4f2b6efa08df8c5deea5998
Reviewed-on: https://gerrit.chromium.org/gerrit/43845
Commit-Queue: David James <davidjames@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Diffstat (limited to 'scripts/parallel_emerge.py')
| -rw-r--r-- | scripts/parallel_emerge.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py index 5e6f6eaf0..dd2be86fa 100644 --- a/scripts/parallel_emerge.py +++ b/scripts/parallel_emerge.py @@ -1199,8 +1199,7 @@ class EmergeQueue(object): # jobs. procs = min(self._total_jobs, emerge.opts.pop("--jobs", multiprocessing.cpu_count())) - self._build_procs = procs - self._fetch_procs = procs + self._build_procs = self._fetch_procs = max(1, procs) self._load_avg = emerge.opts.pop("--load-average", None) self._job_queue = multiprocessing.Queue() self._print_queue = multiprocessing.Queue() |