diff options
Diffstat (limited to 'bitbake/lib/bb')
| -rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index b47a53e3be..39c1839277 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
| @@ -327,7 +327,7 @@ class Git(FetchMethod): | |||
| 327 | if self.clonedir_need_update(ud, d): | 327 | if self.clonedir_need_update(ud, d): |
| 328 | return True | 328 | return True |
| 329 | 329 | ||
| 330 | if not self._lfs_objects_downloaded(ud, d, ud.name, ud.clonedir): | 330 | if not self._lfs_objects_downloaded(ud, d, ud.clonedir): |
| 331 | return True | 331 | return True |
| 332 | return False | 332 | return False |
| 333 | 333 | ||
| @@ -802,7 +802,7 @@ class Git(FetchMethod): | |||
| 802 | raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output)) | 802 | raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output)) |
| 803 | return output.split()[0] != "0" | 803 | return output.split()[0] != "0" |
| 804 | 804 | ||
| 805 | def _lfs_objects_downloaded(self, ud, d, name, wd): | 805 | def _lfs_objects_downloaded(self, ud, d, wd): |
| 806 | """ | 806 | """ |
| 807 | Verifies whether the LFS objects for requested revisions have already been downloaded | 807 | Verifies whether the LFS objects for requested revisions have already been downloaded |
| 808 | """ | 808 | """ |
| @@ -841,7 +841,7 @@ class Git(FetchMethod): | |||
| 841 | 841 | ||
| 842 | if ud.nobranch: | 842 | if ud.nobranch: |
| 843 | # If no branch is specified, use the current git commit | 843 | # If no branch is specified, use the current git commit |
| 844 | refname = self._build_revision(ud, d, ud.name) | 844 | refname = ud.revision |
| 845 | elif wd == ud.clonedir: | 845 | elif wd == ud.clonedir: |
| 846 | # The bare clonedir doesn't use the remote names; it has the branch immediately. | 846 | # The bare clonedir doesn't use the remote names; it has the branch immediately. |
| 847 | refname = ud.branch | 847 | refname = ud.branch |
| @@ -995,7 +995,7 @@ class Git(FetchMethod): | |||
| 995 | Return a sortable revision number by counting commits in the history | 995 | Return a sortable revision number by counting commits in the history |
| 996 | Based on gitpkgv.bblass in meta-openembedded | 996 | Based on gitpkgv.bblass in meta-openembedded |
| 997 | """ | 997 | """ |
| 998 | rev = self._build_revision(ud, d, name) | 998 | rev = ud.revision |
| 999 | localpath = ud.localpath | 999 | localpath = ud.localpath |
| 1000 | rev_file = os.path.join(localpath, "oe-gitpkgv_" + rev) | 1000 | rev_file = os.path.join(localpath, "oe-gitpkgv_" + rev) |
| 1001 | if not os.path.exists(localpath): | 1001 | if not os.path.exists(localpath): |
