From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EAA68138200 for ; Fri, 19 Jul 2013 16:20:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87277E0956; Fri, 19 Jul 2013 16:20:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED4D7E0962 for ; Fri, 19 Jul 2013 16:20:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD4DB33DF72 for ; Fri, 19 Jul 2013 16:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 67474E5463 for ; Fri, 19 Jul 2013 16:20:11 +0000 (UTC) From: "Jauhien Piatlicki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jauhien Piatlicki" Message-ID: <1374250498.6a02fc77f1aa554a115c510aa9958590b6f40dad.jauhien@gentoo> Subject: [gentoo-commits] proj/g-sorcery:master commit in: /, g_sorcery/, gs_ctan/ X-VCS-Repository: proj/g-sorcery X-VCS-Files: g_sorcery/package_db.py gs-ctan.json gs_ctan/ctan_db.py X-VCS-Directories: / g_sorcery/ gs_ctan/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: 6a02fc77f1aa554a115c510aa9958590b6f40dad X-VCS-Branch: master Date: Fri, 19 Jul 2013 16:20:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3ad564aa-ec4b-4cc9-8ef9-58d88da8c96d X-Archives-Hash: 9b5e27b9de14a712382d4e7e166d9883 commit: 6a02fc77f1aa554a115c510aa9958590b6f40dad Author: Jauhien Piatlicki (jauhien) gmail com> AuthorDate: Fri Jul 19 16:14:58 2013 +0000 Commit: Jauhien Piatlicki gmail com> CommitDate: Fri Jul 19 16:14:58 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=6a02fc77 g_sorcery/package_db: convert license --- g_sorcery/package_db.py | 10 ++++++++++ gs-ctan.json | 17 +++++++++++++++++ gs_ctan/ctan_db.py | 3 +-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py index d38a90d..4377c3f 100644 --- a/g_sorcery/package_db.py +++ b/g_sorcery/package_db.py @@ -207,6 +207,16 @@ class PackageDB(object): def process_data(data): pass + def convert_license(self, license_name): + result = license_name + for config in [self.common_config, self.config]: + if config: + if "licenses" in config: + licenses = config["licenses"] + if license_name in licenses: + result = licenses[license_name] + return result + def get_download_uries(self): pass diff --git a/gs-ctan.json b/gs-ctan.json index 0bee1a2..85a356a 100644 --- a/gs-ctan.json +++ b/gs-ctan.json @@ -4,5 +4,22 @@ "ctan": { "repo_uri": "http://mirror.ctan.org/systems/texlive/tlnet/" } + }, + "common_config": { + "licenses": { + "apache2": "Apache-2.0", + "artistic": "Artistic", + "Artistic2": "Artistic-2", + "gpl": "GPL-1", + "gpl2": "GPL-2", + "gpl3": "GPL-3", + "knuth": "TeX", + "lgpl": "LGPL-2", + "lgpl2.1": "LGPL-2.1", + "lppl": "LPPL-1.2", + "lppl1": "LPPL-1.2", + "lppl1.2": "LPPL-1.2", + "lppl1.3": "LPPL-1.3c" + } } } diff --git a/gs_ctan/ctan_db.py b/gs_ctan/ctan_db.py index 1aef53e..c0f91a9 100644 --- a/gs_ctan/ctan_db.py +++ b/gs_ctan/ctan_db.py @@ -141,9 +141,8 @@ class CtanDB(PackageDB): else: version = entry["revision"] - #todo: convert to gentoo licenses if "catalogue-license" in entry: - license = entry["catalogue-license"] + license = self.convert_license(entry["catalogue-license"]) else: license = "unknown"