1 |
commit: 401ab7a946fffff4cf31769160838b7ad176ec23 |
2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Aug 29 16:25:14 2013 +0000 |
4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Aug 29 16:25:14 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=401ab7a9 |
7 |
|
8 |
gs-pypi: correct directory structure in generated DB |
9 |
|
10 |
--- |
11 |
gs_pypi/gs_pypi_generate_db.py | 8 ++++++-- |
12 |
gs_pypi/pypi_db.py | 2 +- |
13 |
2 files changed, 7 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/gs_pypi/gs_pypi_generate_db.py b/gs_pypi/gs_pypi_generate_db.py |
16 |
index 3f2fcd1..a4f8395 100644 |
17 |
--- a/gs_pypi/gs_pypi_generate_db.py |
18 |
+++ b/gs_pypi/gs_pypi_generate_db.py |
19 |
@@ -14,7 +14,8 @@ |
20 |
import os |
21 |
import sys |
22 |
|
23 |
-from g_sorcery.fileutils import FileJSON |
24 |
+from g_sorcery.compatibility import TemporaryDirectory |
25 |
+from g_sorcery.fileutils import copy_all, FileJSON |
26 |
from g_sorcery.logger import Logger |
27 |
|
28 |
from .pypi_db import PypiDBGenerator |
29 |
@@ -45,7 +46,10 @@ def main(): |
30 |
|
31 |
generator = PypiDBGenerator() |
32 |
db_name = sys.argv[1] |
33 |
- pkg_db = generator(db_name, "pypi", config=config["repositories"]["pypi"]) |
34 |
+ temp_dir = TemporaryDirectory() |
35 |
+ pkg_db = generator(temp_dir.name, "pypi", config=config["repositories"]["pypi"]) |
36 |
+ os.mkdir(db_name) |
37 |
+ copy_all(os.path.join(temp_dir.name, "pypi/db"), db_name) |
38 |
os.system('tar cvzf ' + db_name + '.tar.gz ' + db_name) |
39 |
|
40 |
if __name__ == "__main__": |
41 |
|
42 |
diff --git a/gs_pypi/pypi_db.py b/gs_pypi/pypi_db.py |
43 |
index f614c4a..b3e5854 100644 |
44 |
--- a/gs_pypi/pypi_db.py |
45 |
+++ b/gs_pypi/pypi_db.py |
46 |
@@ -53,7 +53,7 @@ class PypiDBGenerator(DBGenerator): |
47 |
soup.decompose() |
48 |
|
49 |
pkg_uries = self.decode_download_uries(pkg_uries) |
50 |
- for uri in pkg_uries: |
51 |
+ for uri in pkg_uries[:10]: |
52 |
attempts = 0 |
53 |
while True: |
54 |
try: |