diff options
| -rw-r--r-- | bitbake/lib/bb/cache.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index eee83b7d09..fb0f40c602 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
| @@ -43,7 +43,7 @@ except ImportError: | |||
| 43 | logger.info("Importing cPickle failed. " | 43 | logger.info("Importing cPickle failed. " |
| 44 | "Falling back to a very slow implementation.") | 44 | "Falling back to a very slow implementation.") |
| 45 | 45 | ||
| 46 | __cache_version__ = "145" | 46 | __cache_version__ = "146" |
| 47 | 47 | ||
| 48 | def getCacheFile(path, filename, data_hash): | 48 | def getCacheFile(path, filename, data_hash): |
| 49 | return os.path.join(path, filename + "." + data_hash) | 49 | 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 1988dc760d..1365335330 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -638,12 +638,12 @@ def get_srcrev(d): | |||
| 638 | ud = urldata[scm] | 638 | ud = urldata[scm] |
| 639 | for name in ud.names: | 639 | for name in ud.names: |
| 640 | autoinc, rev = ud.method.sortable_revision(scm, ud, d, name) | 640 | autoinc, rev = ud.method.sortable_revision(scm, ud, d, name) |
| 641 | seenautoinc = seenautoinc or autoinc | ||
| 641 | if len(rev) > 10: | 642 | if len(rev) > 10: |
| 642 | rev = rev[:10] | 643 | rev = rev[:10] |
| 643 | if autoinc and not seenautoinc: | ||
| 644 | rev = "AUTOINC+" + rev | ||
| 645 | seenautoinc = True | ||
| 646 | format = format.replace(name, rev) | 644 | format = format.replace(name, rev) |
| 645 | if seenautoinc: | ||
| 646 | format = "AUTOINC+" + format | ||
| 647 | 647 | ||
| 648 | return format | 648 | return format |
| 649 | 649 | ||
