aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-03 21:43:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-07 09:06:35 +0000
commit7e4fbfc1c1887a1a0507b60244aa53b8b1994edd (patch)
treedc1a750939bbd5c3a480463eb1047b05c90bd5ce
parent49a022d25d35115e7286e2ca2530566da2d71aa8 (diff)
downloadopenembedded-core-contrib-7e4fbfc1c1887a1a0507b60244aa53b8b1994edd.tar.gz
bitbake/fetch2: Simplfy setup_srcrevs
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py20
1 files changed, 7 insertions, 13 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 05fd81ad4d..af6ac734ed 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -574,7 +574,13 @@ class FetchData(object):
raise NoMethodError("Missing implementation for url %s" % url)
if self.method.supports_srcrev():
- self.setup_srcrevs(d)
+ self.revisions = {}
+ for name in self.names:
+ self.revisions[name] = Fetch.srcrev_internal_helper(self, d, name)
+
+ # add compatibility code for non name specified case
+ if len(self.names) == 1:
+ self.revision = self.revisions[self.names[0]]
if hasattr(self.method, "urldata_init"):
self.method.urldata_init(self, d)
@@ -592,18 +598,6 @@ class FetchData(object):
self.md5 = basepath + '.md5'
self.lockfile = basepath + '.lock'
- def setup_srcrevs(self, d):
- if not self.method.supports_srcrev():
- return
-
- self.revisions = {}
- for name in self.names:
- self.revisions[name] = Fetch.srcrev_internal_helper(self, d, name)
-
- # add compatibility code for non name specified case
- if len(self.names) == 1:
- self.revision = self.revisions[self.names[0]]
-
def setup_localpath(self, d):
if not self.localpath:
self.localpath = self.method.localpath(self.url, self, d)