[regression] Make SRCDATE/CVSDATE for the fetchers work again. This regressed in...

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.

diff --git a/ChangeLog b/ChangeLog
index 873ab86..10505eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 41dca01..c344057 100644 (file)
--- 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)