diff options
Diffstat (limited to 'bitbake-dev/lib/bb/fetch/__init__.py')
-rw-r--r-- | bitbake-dev/lib/bb/fetch/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bitbake-dev/lib/bb/fetch/__init__.py b/bitbake-dev/lib/bb/fetch/__init__.py index 3633584992..39a577b2eb 100644 --- a/bitbake-dev/lib/bb/fetch/__init__.py +++ b/bitbake-dev/lib/bb/fetch/__init__.py | |||
@@ -508,7 +508,7 @@ class Fetch(object): | |||
508 | raise ParameterError | 508 | raise ParameterError |
509 | 509 | ||
510 | pd = persist_data.PersistData(d) | 510 | pd = persist_data.PersistData(d) |
511 | key = self._revision_key(url, ud, d) | 511 | key = self.generate_revision_key(url, ud, d) |
512 | rev = pd.getValue("BB_URI_HEADREVS", key) | 512 | rev = pd.getValue("BB_URI_HEADREVS", key) |
513 | if rev != None: | 513 | if rev != None: |
514 | return str(rev) | 514 | return str(rev) |
@@ -521,11 +521,13 @@ class Fetch(object): | |||
521 | """ | 521 | """ |
522 | 522 | ||
523 | """ | 523 | """ |
524 | if hasattr(self, "_sortable_revision"): | 524 | has_sortable = hasattr(self, "_sortable_revision") |
525 | if has_sortable: | ||
525 | return self._sortable_revision(url, ud, d) | 526 | return self._sortable_revision(url, ud, d) |
526 | 527 | ||
527 | pd = persist_data.PersistData(d) | 528 | pd = persist_data.PersistData(d) |
528 | key = self._revision_key(url, ud, d) | 529 | key = self.generate_revision_key(url, ud, d) |
530 | |||
529 | latest_rev = self._build_revision(url, ud, d) | 531 | latest_rev = self._build_revision(url, ud, d) |
530 | last_rev = pd.getValue("BB_URI_LOCALCOUNT", key + "_rev") | 532 | last_rev = pd.getValue("BB_URI_LOCALCOUNT", key + "_rev") |
531 | count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count") | 533 | count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count") |
@@ -543,6 +545,9 @@ class Fetch(object): | |||
543 | 545 | ||
544 | return str(count + "+" + latest_rev) | 546 | return str(count + "+" + latest_rev) |
545 | 547 | ||
548 | def generate_revision_key(self, url, ud, d): | ||
549 | key = self._revision_key(url, ud, d) | ||
550 | return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "") | ||
546 | 551 | ||
547 | import cvs | 552 | import cvs |
548 | import git | 553 | import git |