diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-19 23:31:09 +0100 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-06 17:44:21 -0700 |
commit | f15a4a76770cb5eca3cd518b0ad5f7470e761017 (patch) | |
tree | 0279f41ae8643489f75adfc6387353274e4f946f /bitbake/lib/bb/fetch2/__init__.py | |
parent | 0e55651fd0f12c98c5a4b894dde9162c8abcdca7 (diff) | |
download | poky-f15a4a76770cb5eca3cd518b0ad5f7470e761017.tar.gz |
bitbake/fetch2/git: Fix a bug where AUTOREV and the git fetcher interact badly
Fix a bug where ud.branches were being referenced before it was set by
the git fetcher when using AUTOREV. To do this some ordering needed
to be changed. This fixes errors like:
ERROR: Error parsing /recipes-kernel/linux/rt-tests_git.bb: Failure expanding variable
SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
AttributeError: 'FetchData' object has no attribute 'branches'
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 9fec705ad6..f53467e73b 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -555,6 +555,9 @@ class FetchData(object): | |||
555 | if not self.method: | 555 | if not self.method: |
556 | raise NoMethodError(url) | 556 | raise NoMethodError(url) |
557 | 557 | ||
558 | if hasattr(self.method, "urldata_init"): | ||
559 | self.method.urldata_init(self, d) | ||
560 | |||
558 | if self.method.supports_srcrev(): | 561 | if self.method.supports_srcrev(): |
559 | self.revisions = {} | 562 | self.revisions = {} |
560 | for name in self.names: | 563 | for name in self.names: |
@@ -564,8 +567,8 @@ class FetchData(object): | |||
564 | if len(self.names) == 1: | 567 | if len(self.names) == 1: |
565 | self.revision = self.revisions[self.names[0]] | 568 | self.revision = self.revisions[self.names[0]] |
566 | 569 | ||
567 | if hasattr(self.method, "urldata_init"): | 570 | if hasattr(self.method, "fixuprevisions"): |
568 | self.method.urldata_init(self, d) | 571 | self.method.fixuprevisions(self, d) |
569 | 572 | ||
570 | if "localpath" in self.parm: | 573 | if "localpath" in self.parm: |
571 | # if user sets localpath for file, use it instead. | 574 | # if user sets localpath for file, use it instead. |