diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2007-08-18 17:31:56 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2007-08-18 17:31:56 +0000 |
| commit | 1057f18a04889c4ad04a40f9d00f0a4df30af2b4 (patch) | |
| tree | abdf67e1a438d4b9c1c9d22ae770e56719d07bf3 | |
| parent | 43d38a0d0bd4f45aeab1c4892bd6835e7cf51a0f (diff) | |
| download | bitbake-1057f18a04889c4ad04a40f9d00f0a4df30af2b4.tar.gz | |
[regression] Make SRCDATE/CVSDATE for the fetchers work again. This regressed in r653
PN should always be set for files as it comes from bitbake.conf but as we are close
to a release make the least intrusive change and copy SRCDATE and CVSDATE to the above
line as well. I think the second return is dead code and we should remove it.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | lib/bb/fetch/__init__.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -33,6 +33,7 @@ Changes in Bitbake 1.8.x: - Split expandKeys into two for loops to benefit from the expand_cache (12% speedup) - runqueue.py: Fix idepends handling to avoid dependency errors - Clear the terminal TOSTOP flag if set (and warn the user) + - Fix regression from r653 and make SRCDATE/CVSDATE work for packages again Changes in Bitbake 1.8.6: - Correctly redirect stdin when forking diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index 41dca017b..c34405738 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -340,7 +340,7 @@ class Fetch(object): 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("DATE", d, 1) + 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) |