Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/portage/cache/, pym/portage/repository/
Date: Fri, 30 Sep 2011 19:09:13
Message-Id: ed3b2b43aa329d007f7bb0eb303b3f74e927970a.zmedico@gentoo
1 commit: ed3b2b43aa329d007f7bb0eb303b3f74e927970a
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 19:08:31 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 19:08:31 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ed3b2b43
7
8 Fix 'authoritative' spelling.
9
10 ---
11 pym/portage/cache/template.py | 2 +-
12 pym/portage/dbapi/porttree.py | 4 ++--
13 pym/portage/repository/config.py | 6 +++---
14 3 files changed, 6 insertions(+), 6 deletions(-)
15
16 diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
17 index 4cb27bf..8476836 100644
18 --- a/pym/portage/cache/template.py
19 +++ b/pym/portage/cache/template.py
20 @@ -30,7 +30,7 @@ class database(object):
21 self.readonly = readonly
22 self.sync_rate = 0
23 self.updates = 0
24 - self.is_authorative = False
25 + self.is_authoritative = False
26
27 def __getitem__(self, cpv):
28 """set a cpv to values
29
30 diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
31 index ab38247..911dbb5 100644
32 --- a/pym/portage/dbapi/porttree.py
33 +++ b/pym/portage/dbapi/porttree.py
34 @@ -218,7 +218,7 @@ class portdbapi(dbapi):
35 conf = self.repositories.get_repo_for_location(x)
36 cache = self._pregen_auxdb[x] = self.metadbmodule(
37 x, "metadata/cache", filtered_auxdbkeys, readonly=True)
38 - cache.is_authorative = conf.cache_is_authorative
39 + cache.is_authoritative = conf.cache_is_authoritative
40 try:
41 cache.ec = self._repo_info[x].eclass_db
42 except AttributeError:
43 @@ -444,7 +444,7 @@ class portdbapi(dbapi):
44 if not eapi:
45 eapi = '0'
46 if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])):
47 - if auxdb.is_authorative or ( \
48 + if auxdb.is_authoritative or ( \
49 emtime == metadata['_mtime_'] and \
50 eclass_db.is_eclass_data_valid(metadata['_eclasses_'])):
51 doregen = False
52
53 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
54 index 6924450..424b89d 100644
55 --- a/pym/portage/repository/config.py
56 +++ b/pym/portage/repository/config.py
57 @@ -43,7 +43,7 @@ class RepoConfig(object):
58
59 __slots__ = ['aliases', 'eclass_overrides', 'eclass_locations', 'location', 'user_location', 'masters', 'main_repo',
60 'missing_repo_name', 'name', 'priority', 'sync', 'format', 'sign_manifest', 'thin_manifest',
61 - 'allow_missing_manifest', 'create_manifest', 'disable_manifest', 'cache_is_authorative']
62 + 'allow_missing_manifest', 'create_manifest', 'disable_manifest', 'cache_is_authoritative']
63
64 def __init__(self, name, repo_opts):
65 """Build a RepoConfig with options in repo_opts
66 @@ -117,7 +117,7 @@ class RepoConfig(object):
67 self.allow_missing_manifest = False
68 self.create_manifest = True
69 self.disable_manifest = False
70 - self.cache_is_authorative = False
71 + self.cache_is_authoritative = False
72
73 def load_manifest(self, *args, **kwds):
74 kwds['thin'] = self.thin_manifest
75 @@ -358,7 +358,7 @@ class RepoConfigLoader(object):
76 repo.allow_missing_manifest = manifest_policy != 'strict'
77 repo.create_manifest = manifest_policy != 'false'
78 repo.disable_manifest = manifest_policy == 'false'
79 - repo.cache_is_authorative = layout_data.get('authorative-cache', 'false').lower() == 'true'
80 + repo.cache_is_authoritative = layout_data.get('authoritative-cache', 'false').lower() == 'true'
81
82 #Take aliases into account.
83 new_prepos = {}