diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-06-04 14:04:41 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:35 +0100 |
commit | 726802b98071f6139c9305be0383a2be20a37f4e (patch) | |
tree | 0864d2a7084f1681c6f14660f4940ca5ddb00672 /bitbake/lib/bb/fetch | |
parent | 30216c65e59e7072bed5001598240dcc58017940 (diff) | |
download | poky-726802b98071f6139c9305be0383a2be20a37f4e.tar.gz |
persist_data: cache connection and use cursor
Store database connection to persistent database in fetcher.
(Bitbake rev: 8a6876752b90efd81d92f0947bfc9527d8260969)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 01bcd36539..701e79025a 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py | |||
@@ -146,13 +146,14 @@ def uri_replace(uri, uri_find, uri_replace, d): | |||
146 | methods = [] | 146 | methods = [] |
147 | urldata_cache = {} | 147 | urldata_cache = {} |
148 | saved_headrevs = {} | 148 | saved_headrevs = {} |
149 | persistent_database_connection = {} | ||
149 | 150 | ||
150 | def fetcher_init(d): | 151 | def fetcher_init(d): |
151 | """ | 152 | """ |
152 | Called to initialize the fetchers once the configuration data is known. | 153 | Called to initialize the fetchers once the configuration data is known. |
153 | Calls before this must not hit the cache. | 154 | Calls before this must not hit the cache. |
154 | """ | 155 | """ |
155 | pd = persist_data.PersistData(d) | 156 | pd = persist_data.PersistData(d, persistent_database_connection) |
156 | # When to drop SCM head revisions controlled by user policy | 157 | # When to drop SCM head revisions controlled by user policy |
157 | srcrev_policy = bb.data.getVar('BB_SRCREV_POLICY', d, 1) or "clear" | 158 | srcrev_policy = bb.data.getVar('BB_SRCREV_POLICY', d, 1) or "clear" |
158 | if srcrev_policy == "cache": | 159 | if srcrev_policy == "cache": |
@@ -181,7 +182,7 @@ def fetcher_compare_revisons(d): | |||
181 | return true/false on whether they've changed. | 182 | return true/false on whether they've changed. |
182 | """ | 183 | """ |
183 | 184 | ||
184 | pd = persist_data.PersistData(d) | 185 | pd = persist_data.PersistData(d, persistent_database_connection) |
185 | data = pd.getKeyValues("BB_URI_HEADREVS") | 186 | data = pd.getKeyValues("BB_URI_HEADREVS") |
186 | data2 = bb.fetch.saved_headrevs | 187 | data2 = bb.fetch.saved_headrevs |
187 | 188 | ||
@@ -673,7 +674,7 @@ class Fetch(object): | |||
673 | if not hasattr(self, "_latest_revision"): | 674 | if not hasattr(self, "_latest_revision"): |
674 | raise ParameterError | 675 | raise ParameterError |
675 | 676 | ||
676 | pd = persist_data.PersistData(d) | 677 | pd = persist_data.PersistData(d, persistent_database_connection) |
677 | key = self.generate_revision_key(url, ud, d) | 678 | key = self.generate_revision_key(url, ud, d) |
678 | rev = pd.getValue("BB_URI_HEADREVS", key) | 679 | rev = pd.getValue("BB_URI_HEADREVS", key) |
679 | if rev != None: | 680 | if rev != None: |
@@ -690,7 +691,7 @@ class Fetch(object): | |||
690 | if hasattr(self, "_sortable_revision"): | 691 | if hasattr(self, "_sortable_revision"): |
691 | return self._sortable_revision(url, ud, d) | 692 | return self._sortable_revision(url, ud, d) |
692 | 693 | ||
693 | pd = persist_data.PersistData(d) | 694 | pd = persist_data.PersistData(d, persistent_database_connection) |
694 | key = self.generate_revision_key(url, ud, d) | 695 | key = self.generate_revision_key(url, ud, d) |
695 | 696 | ||
696 | latest_rev = self._build_revision(url, ud, d) | 697 | latest_rev = self._build_revision(url, ud, d) |