diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-01-26 15:34:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:40:58 +0000 |
commit | 81bc1f20662c39ee8db1da45b1e8c7eb64abacf3 (patch) | |
tree | de46e65ca8331afc84d4c4c3dcc8f33a10246d12 | |
parent | cc4cfc2370297b8feb2dc39d4262e73adf06c09a (diff) | |
download | openembedded-core-contrib-81bc1f20662c39ee8db1da45b1e8c7eb64abacf3.tar.gz |
bb/cache: drop some unused arguments
Drop unused 'd' argument from the cache save methods, simplifying the
API.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/cache.py | 4 | ||||
-rw-r--r-- | lib/bb/codeparser.py | 8 | ||||
-rw-r--r-- | lib/bb/cooker.py | 8 | ||||
-rw-r--r-- | lib/bb/fetch2/__init__.py | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 8485eb467a..55283b03d6 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -785,7 +785,7 @@ class MultiProcessCache(object): data = [{}] return data - def save_extras(self, d): + def save_extras(self): if not self.cachefile: return @@ -815,7 +815,7 @@ class MultiProcessCache(object): if h not in dest[j]: dest[j][h] = source[j][h] - def save_merge(self, d): + def save_merge(self): if not self.cachefile: return diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py index 2094f1337c..3ee4d5622b 100644 --- a/lib/bb/codeparser.py +++ b/lib/bb/codeparser.py @@ -167,11 +167,11 @@ codeparsercache = CodeParserCache() def parser_cache_init(d): codeparsercache.init_cache(d) -def parser_cache_save(d): - codeparsercache.save_extras(d) +def parser_cache_save(): + codeparsercache.save_extras() -def parser_cache_savemerge(d): - codeparsercache.save_merge(d) +def parser_cache_savemerge(): + codeparsercache.save_merge() Logger = logging.getLoggerClass() class BufferedLogger(Logger): diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index b4486f3078..96cefc73fd 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -2030,8 +2030,8 @@ class CookerParser(object): def init(): Parser.cfg = self.cfgdata bb.utils.set_process_name(multiprocessing.current_process().name) - multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, args=(self.cfgdata,), exitpriority=1) - multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, args=(self.cfgdata,), exitpriority=1) + multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, exitpriority=1) + multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, exitpriority=1) self.feeder_quit = multiprocessing.Queue(maxsize=1) self.parser_quit = multiprocessing.Queue(maxsize=self.num_processes) @@ -2085,8 +2085,8 @@ class CookerParser(object): sync = threading.Thread(target=self.bb_cache.sync) sync.start() multiprocessing.util.Finalize(None, sync.join, exitpriority=-100) - bb.codeparser.parser_cache_savemerge(self.cooker.data) - bb.fetch.fetcher_parse_done(self.cooker.data) + bb.codeparser.parser_cache_savemerge() + bb.fetch.fetcher_parse_done() if self.cooker.configuration.profile: profiles = [] for i in self.process_names: diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index c3dcfd2ccb..83122e856c 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -515,13 +515,13 @@ def fetcher_init(d): if hasattr(m, "init"): m.init(d) -def fetcher_parse_save(d): - _checksum_cache.save_extras(d) +def fetcher_parse_save(): + _checksum_cache.save_extras() -def fetcher_parse_done(d): - _checksum_cache.save_merge(d) +def fetcher_parse_done(): + _checksum_cache.save_merge() -def fetcher_compare_revisions(d): +def fetcher_compare_revisions(): """ Compare the revisions in the persistant cache with current values and return true/false on whether they've changed. |