From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-602055-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3121F1381F3 for <garchives@archives.gentoo.org>; Mon, 24 Jun 2013 21:09:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21ECBE09C3; Mon, 24 Jun 2013 21:09:41 +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 8BAB3E09C3 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2013 21:09:40 +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 37ECC33E66C for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2013 21:09:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DBC39E545E for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2013 21:09:37 +0000 (UTC) From: "Jauhien Piatlicki" <piatlicki@gmail.com> 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" <piatlicki@gmail.com> Message-ID: <1372108247.5614a06b63770e93447a5fb93aada06902775393.jauhien@gentoo> Subject: [gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/ X-VCS-Repository: proj/g-sorcery X-VCS-Files: g_sorcery/package_db.py X-VCS-Directories: g_sorcery/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: 5614a06b63770e93447a5fb93aada06902775393 X-VCS-Branch: master Date: Mon, 24 Jun 2013 21:09:37 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5e696907-438b-4bb6-b177-54d97a2680a9 X-Archives-Hash: 9735867e93ec633ea684beb657e929be commit: 5614a06b63770e93447a5fb93aada06902775393 Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> AuthorDate: Mon Jun 24 21:10:47 2013 +0000 Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> CommitDate: Mon Jun 24 21:10:47 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=5614a06b g_sorcery/package_db: fixes, thanks to dolsen --- g_sorcery/package_db.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py index 7d7c901..1fe4b38 100644 --- a/g_sorcery/package_db.py +++ b/g_sorcery/package_db.py @@ -296,17 +296,21 @@ class PackageDB: def additional_read(self): pass - def add_category(self, category, description={}): + def add_category(self, category, description=None): + if not description: + description = {} self.db['categories'][category] = description; self.db['packages'][category] = {} - def add_package(self, package, description={}): + def add_package(self, package, description=None): + if not description: + description = {} category = package.category name = package.name version = package.version - if not category in self.db['packages']: + if category and not category in self.db['packages']: raise Exception('Non-existent category: ' + category) - if not name in self.db['packages'][category]: + if name and not name in self.db['packages'][category]: self.db['packages'][category][name] = {} self.db['packages'][category][name][version] = description @@ -314,14 +318,14 @@ class PackageDB: return list(self.db['categories']) def list_package_names(self, category): - if not category in self.db['packages']: + if category and not category in self.db['packages']: raise Exception('No such category: ' + category) return list(self.db['packages'][category]) def list_package_versions(self, category, name): - if not category in self.db['packages']: + if category and not category in self.db['packages']: raise Exception('No such category: ' + category) - if not name in self.db['packages'][category]: + if name and not name in self.db['packages'][category]: raise Exception('No such package: ' + name) return list(self.db['packages'][category][name])