diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-03-24 16:56:12 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
| commit | 7acc132cac873e60005516272473a55a8160b9c4 (patch) | |
| tree | 2e4122862ffd856803160b6089fcb979d3efd630 /bitbake/lib/bb/fetch/git.py | |
| parent | bbf83fd988ca3cf9dae7d2b542a11a7c942b1702 (diff) | |
| download | poky-7acc132cac873e60005516272473a55a8160b9c4.tar.gz | |
Formatting cleanups
(Bitbake rev: 2caf134b43a44dad30af4fbe33033b3c58deee57)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch/git.py')
| -rw-r--r-- | bitbake/lib/bb/fetch/git.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 41ebc5b998..5332686252 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py | |||
| @@ -57,12 +57,12 @@ class Git(Fetch): | |||
| 57 | 57 | ||
| 58 | tag = Fetch.srcrev_internal_helper(ud, d) | 58 | tag = Fetch.srcrev_internal_helper(ud, d) |
| 59 | if tag is True: | 59 | if tag is True: |
| 60 | ud.tag = self.latest_revision(url, ud, d) | 60 | ud.tag = self.latest_revision(url, ud, d) |
| 61 | elif tag: | 61 | elif tag: |
| 62 | ud.tag = tag | 62 | ud.tag = tag |
| 63 | 63 | ||
| 64 | if not ud.tag or ud.tag == "master": | 64 | if not ud.tag or ud.tag == "master": |
| 65 | ud.tag = self.latest_revision(url, ud, d) | 65 | ud.tag = self.latest_revision(url, ud, d) |
| 66 | 66 | ||
| 67 | subdir = ud.parm.get("subpath", "") | 67 | subdir = ud.parm.get("subpath", "") |
| 68 | if subdir != "": | 68 | if subdir != "": |
| @@ -114,7 +114,7 @@ class Git(Fetch): | |||
| 114 | 114 | ||
| 115 | os.chdir(ud.clonedir) | 115 | os.chdir(ud.clonedir) |
| 116 | mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) | 116 | mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) |
| 117 | if mirror_tarballs != "0" or 'fullclone' in ud.parm: | 117 | if mirror_tarballs != "0" or 'fullclone' in ud.parm: |
| 118 | bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git repository") | 118 | bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git repository") |
| 119 | runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d) | 119 | runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d) |
| 120 | 120 | ||
| @@ -188,7 +188,7 @@ class Git(Fetch): | |||
| 188 | 188 | ||
| 189 | def _sortable_buildindex_disabled(self, url, ud, d, rev): | 189 | def _sortable_buildindex_disabled(self, url, ud, d, rev): |
| 190 | """ | 190 | """ |
| 191 | Return a suitable buildindex for the revision specified. This is done by counting revisions | 191 | Return a suitable buildindex for the revision specified. This is done by counting revisions |
| 192 | using "git rev-list" which may or may not work in different circumstances. | 192 | using "git rev-list" which may or may not work in different circumstances. |
| 193 | """ | 193 | """ |
| 194 | 194 | ||
| @@ -213,5 +213,4 @@ class Git(Fetch): | |||
| 213 | 213 | ||
| 214 | buildindex = "%s" % output.split()[0] | 214 | buildindex = "%s" % output.split()[0] |
| 215 | bb.msg.debug(1, bb.msg.domain.Fetcher, "GIT repository for %s in %s is returning %s revisions in rev-list before %s" % (url, ud.clonedir, buildindex, rev)) | 215 | bb.msg.debug(1, bb.msg.domain.Fetcher, "GIT repository for %s in %s is returning %s revisions in rev-list before %s" % (url, ud.clonedir, buildindex, rev)) |
| 216 | return buildindex | 216 | return buildindex |
| 217 | |||
