summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 17:10:36 (GMT)
committer Richard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 11:52:56 (GMT)
commitcd7b7de91a98e712e796a8d6a3a8e3741950396e (patch)
tree95000aaf4bb02955498b5e2412ec215d90b1be10
parent534c4d0f1e287d0ac82504b273a5497d3457582a (diff)
downloadpoky-cd7b7de91a98e712e796a8d6a3a8e3741950396e.zip
poky-cd7b7de91a98e712e796a8d6a3a8e3741950396e.tar.gz
poky-cd7b7de91a98e712e796a8d6a3a8e3741950396e.tar.bz2
bitbake: fetch2: Fix AUTOINC handling
AUTOINC was meant to appear once at the start of the version string. The list of names may not be sorted meaning it could get inserted in the middle. This patch simplifies the code and ensures it appears at the start. Include cache version bump to ensure the cache picks up these changes. (Bitbake rev: ad8bf10d873abb94d987860a3f6d06b134fb8a99) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cache.py2
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index eee83b7..fb0f40c 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -43,7 +43,7 @@ except ImportError:
logger.info("Importing cPickle failed. "
"Falling back to a very slow implementation.")
-__cache_version__ = "145"
+__cache_version__ = "146"
def getCacheFile(path, filename, data_hash):
return os.path.join(path, filename + "." + data_hash)
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 1988dc7..1365335 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -638,12 +638,12 @@ def get_srcrev(d):
ud = urldata[scm]
for name in ud.names:
autoinc, rev = ud.method.sortable_revision(scm, ud, d, name)
+ seenautoinc = seenautoinc or autoinc
if len(rev) > 10:
rev = rev[:10]
- if autoinc and not seenautoinc:
- rev = "AUTOINC+" + rev
- seenautoinc = True
format = format.replace(name, rev)
+ if seenautoinc:
+ format = "AUTOINC+" + format
return format