summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-04 11:02:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-10 23:37:03 +0000
commit8619538e7579f17ce95ae3243758c3f9ecdca0e6 (patch)
treedfbff98c4f672211352b4e9aca9017dba5547405
parent7ffcda8bfacb85f7f11859f0c88f5a406172243a (diff)
downloadbitbake-8619538e7579f17ce95ae3243758c3f9ecdca0e6.tar.gz
bitbake/fetch2: Move getSRCDate to FetchData class where is more appropriate
(From Poky rev: f60d9d6bd4bb7691b62bf1f4b1fbeaa1faa53879) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/__init__.py34
1 files changed, 16 insertions, 18 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 03a80d989..5cd7061cf 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -617,7 +617,7 @@ class FetchData(object):
self.localpath = None
self.lockfile = None
(self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d))
- self.date = FetchMethod.getSRCDate(self, d)
+ self.date = self.getSRCDate(d)
self.url = url
if not self.user and "user" in self.parm:
self.user = self.parm["user"]
@@ -674,6 +674,21 @@ class FetchData(object):
if not self.localpath:
self.localpath = self.method.localpath(self.url, self, d)
+ def getSRCDate(self, d):
+ """
+ Return the SRC Date for the component
+
+ d the bb.data module
+ """
+ if "srcdate" in self.parm:
+ return self.parm['srcdate']
+
+ pn = data.getVar("PN", d, 1)
+
+ if pn:
+ return data.getVar("SRCDATE_%s" % pn, d, 1) or data.getVar("CVSDATE_%s" % pn, d, 1) or data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
+
+ return data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
class FetchMethod(object):
"""Base class for 'fetch'ing data"""
@@ -823,23 +838,6 @@ class FetchMethod(object):
logger.info("URL %s could not be checked for status since no method exists.", url)
return True
- def getSRCDate(urldata, d):
- """
- Return the SRC Date for the component
-
- d the bb.data module
- """
- if "srcdate" in urldata.parm:
- return urldata.parm['srcdate']
-
- pn = data.getVar("PN", d, 1)
-
- if pn:
- return data.getVar("SRCDATE_%s" % pn, d, 1) or data.getVar("CVSDATE_%s" % pn, d, 1) or data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
-
- return data.getVar("SRCDATE", d, 1) or data.getVar("CVSDATE", d, 1) or data.getVar("DATE", d, 1)
- getSRCDate = staticmethod(getSRCDate)
-
def localcount_internal_helper(ud, d, name):
"""
Return: