| 1 |
commit: 6bcd4e629c64b3f16166e0d53ed8820a9cbbfe11 |
| 2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jun 29 12:14:21 2013 +0000 |
| 4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Jun 29 12:14:21 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=6bcd4e62 |
| 7 |
|
| 8 |
g_sorcery/package_db: self.db['categories'] -> self.categories |
| 9 |
|
| 10 |
--- |
| 11 |
g_sorcery/package_db.py | 14 +++++++------- |
| 12 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py |
| 15 |
index fcf2267..629f4ce 100644 |
| 16 |
--- a/g_sorcery/package_db.py |
| 17 |
+++ b/g_sorcery/package_db.py |
| 18 |
@@ -103,7 +103,7 @@ class PackageDB: |
| 19 |
def reset_db(self): |
| 20 |
self.db = {} |
| 21 |
self.info = {} |
| 22 |
- self.db['categories'] = {} |
| 23 |
+ self.categories = {} |
| 24 |
self.db['packages'] = {} |
| 25 |
|
| 26 |
def generate(self, repo_uri=""): |
| 27 |
@@ -216,8 +216,8 @@ class PackageDB: |
| 28 |
info_f = FileJSON(self.directory, self.INFO_NAME, []) |
| 29 |
categories_f = FileJSON(self.directory, self.CATEGORIES_NAME, []) |
| 30 |
info_f.write(self.info) |
| 31 |
- categories_f.write(self.db['categories']) |
| 32 |
- for category in self.db['categories']: |
| 33 |
+ categories_f.write(self.categories) |
| 34 |
+ for category in self.categories: |
| 35 |
if not category in self.db['packages']: |
| 36 |
raise DBStructureError('Empty category: ' + category) |
| 37 |
for package, versions in self.db['packages'][category].items(): |
| 38 |
@@ -255,8 +255,8 @@ class PackageDB: |
| 39 |
info_f = FileJSON(self.directory, self.INFO_NAME, []) |
| 40 |
categories_f = FileJSON(self.directory, self.CATEGORIES_NAME, []) |
| 41 |
self.info = info_f.read() |
| 42 |
- self.db['categories'] = categories_f.read() |
| 43 |
- for category in self.db['categories']: |
| 44 |
+ self.categories = categories_f.read() |
| 45 |
+ for category in self.categories: |
| 46 |
category_path = os.path.join(self.directory, category) |
| 47 |
if not os.path.isdir(category_path): |
| 48 |
raise DBStructureError('Empty category: ' + category) |
| 49 |
@@ -302,7 +302,7 @@ class PackageDB: |
| 50 |
def add_category(self, category, description=None): |
| 51 |
if not description: |
| 52 |
description = {} |
| 53 |
- self.db['categories'][category] = description; |
| 54 |
+ self.categories[category] = description; |
| 55 |
self.db['packages'][category] = {} |
| 56 |
|
| 57 |
def add_package(self, package, description=None): |
| 58 |
@@ -318,7 +318,7 @@ class PackageDB: |
| 59 |
self.db['packages'][category][name][version] = description |
| 60 |
|
| 61 |
def list_categories(self): |
| 62 |
- return list(self.db['categories']) |
| 63 |
+ return list(self.categories) |
| 64 |
|
| 65 |
def list_package_names(self, category): |
| 66 |
if category and not category in self.db['packages']: |
Archives