diff options
| author |   Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-09-06 17:42:02 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki (jauhien) <piatlicki@gmail.com> | 2013-09-06 17:42:02 +0200 |
| commit | 4f81685858f43cc42c91acb3ec74868604b1f233 (patch) | |
| tree | 531d6302bff22f30c32ee21d3a68241811230d1e /gs_pypi | |
| parent | gs_pypi/pypi_db: fix typo (diff) | |
| download | g-sorcery-4f81685858f43cc42c91acb3ec74868604b1f233.tar.gz g-sorcery-4f81685858f43cc42c91acb3ec74868604b1f233.tar.bz2 g-sorcery-4f81685858f43cc42c91acb3ec74868604b1f233.zip | |
gs-pypi: fix errors
Diffstat (limited to 'gs_pypi')
| -rw-r--r-- | gs_pypi/gs_pypi_generate_db.py | 2 | ||||
| -rw-r--r-- | gs_pypi/pypi_db.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gs_pypi/gs_pypi_generate_db.py b/gs_pypi/gs_pypi_generate_db.py index 1d95a8a..a59b5e3 100644 --- a/gs_pypi/gs_pypi_generate_db.py +++ b/gs_pypi/gs_pypi_generate_db.py @@ -48,7 +48,7 @@ def main(): generator = PypiDBGenerator() db_name = sys.argv[1] temp_dir = TemporaryDirectory() - pkg_db = generator(temp_dir.name, "pypi", config=config["repositories"]["pypi"]) + pkg_db = generator(temp_dir.name, "pypi", config=config["repositories"]["pypi"], common_config=config["common_config"]) if os.path.exists(db_name): os.system('rm -rf ' + db_name + '/*') else: diff --git a/gs_pypi/pypi_db.py b/gs_pypi/pypi_db.py index a700e4b..f982fcd 100644 --- a/gs_pypi/pypi_db.py +++ b/gs_pypi/pypi_db.py @@ -200,7 +200,7 @@ class PypiDBGenerator(DBGenerator): continue homepage = "" - license = "" + pkg_license = "" py_versions = [] if info: if "Home Page:" in info: @@ -225,8 +225,8 @@ class PypiDBGenerator(DBGenerator): py_versions.extend(['3_3']) if "License" in categories: - license = categories["License"][-1] - license = self.convert([common_config, config], "licenses", license) + pkg_license = categories["License"][-1] + pkg_license = self.convert([common_config, config], "licenses", pkg_license) if not py_versions: py_versions = ['2_6', '2_7', '3_2', '3_3'] @@ -236,7 +236,7 @@ class PypiDBGenerator(DBGenerator): python_compat = '( python{' + py_versions[0] for ver in py_versions[1:]: python_compat += ',' + ver - python_compat += '} )' + python_compat += '} )' filtered_package = "".join([x for x in package if ord(x) in allowed_ords_pkg]) description = "".join([x for x in description if ord(x) in allowed_ords_desc]) @@ -262,7 +262,7 @@ class PypiDBGenerator(DBGenerator): ebuild_data["maintainer"] = maintainer ebuild_data["homepage"] = homepage - ebuild_data["license"] = license + ebuild_data["license"] = pkg_license ebuild_data["source_uri"] = source_uri ebuild_data["md5"] = md5 ebuild_data["python_compat"] = python_compat |