summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-11-25 01:00:42 +0100
committerMichał Górny <mgorny@gentoo.org>2017-11-25 01:00:42 +0100
commit6283a3ab918f78f209f1457b82efd5156b054ea5 (patch)
tree9e43942f7dfda3723b5cde6500367c2fddc6a329
parent5f7660e6c3639aa77c9414082589976a3d2a6716 (diff)
downloadgemato-6283a3ab918f78f209f1457b82efd5156b054ea5.tar.gz
Revert "gen_fast_metamanifest: Use context manager for Pool"
This API does not seem to be present in Python 2. Given its little value in this script, let's just revert it.
-rwxr-xr-xutils/gen_fast_metamanifest.py37
1 files changed, 19 insertions, 18 deletions
diff --git a/utils/gen_fast_metamanifest.py b/utils/gen_fast_metamanifest.py
index c5272b4..bd26c09 100755
--- a/utils/gen_fast_metamanifest.py
+++ b/utils/gen_fast_metamanifest.py
@@ -72,24 +72,25 @@ IGNORE lost+found
IGNORE packages
''')
- with multiprocessing.Pool() as p:
- # generate 1st batch of sub-Manifests
- # expecting 20000+ items, so use iterator with a reasonably large
- # chunksize
- p.map(gen_fast_manifest.gen_manifest, manifest_dir_generator(1), chunksize=64)
-
- # timestamp into tier 1 directories
- ts = datetime.datetime.utcnow().strftime(
- 'TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii')
- with io.open('metadata/glsa/Manifest', 'ab') as f:
- f.write(ts)
- with io.open('metadata/news/Manifest', 'ab') as f:
- f.write(ts)
-
- # 2nd batch (files depending on results of 1st batch)
- # this one is fast to generate, so let's pass a list and let map()
- # choose optimal chunksize
- p.map(gen_fast_manifest.gen_manifest, list(manifest_dir_generator(2)))
+ p = multiprocessing.Pool()
+
+ # generate 1st batch of sub-Manifests
+ # expecting 20000+ items, so use iterator with a reasonably large
+ # chunksize
+ p.map(gen_fast_manifest.gen_manifest, manifest_dir_generator(1), chunksize=64)
+
+ # timestamp into tier 1 directories
+ ts = datetime.datetime.utcnow().strftime(
+ 'TIMESTAMP %Y-%m-%dT%H:%M:%SZ\n').encode('ascii')
+ with io.open('metadata/glsa/Manifest', 'ab') as f:
+ f.write(ts)
+ with io.open('metadata/news/Manifest', 'ab') as f:
+ f.write(ts)
+
+ # 2nd batch (files depending on results of 1st batch)
+ # this one is fast to generate, so let's pass a list and let map()
+ # choose optimal chunksize
+ p.map(gen_fast_manifest.gen_manifest, list(manifest_dir_generator(2)))
# finally, generate the top-level Manifest
gen_fast_manifest.gen_manifest('.')