[bitbake-devel] [PATCH] fetch2: Fix AUTOINC handling
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Jun 7 17:10:36 UTC 2013
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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
More information about the bitbake-devel
mailing list