diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/ChangeLog | 4 | ||||
-rw-r--r-- | bitbake/MANIFEST | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch/git.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog index 72ef22d610..7e6b7b26a4 100644 --- a/bitbake/ChangeLog +++ b/bitbake/ChangeLog | |||
@@ -1,3 +1,7 @@ | |||
1 | Changes in BitBake 1.8.x: | ||
2 | - Fix exit code for build failures in --continue mode | ||
3 | - Fix git branch tags fetching | ||
4 | |||
1 | Changes in BitBake 1.8.10: | 5 | Changes in BitBake 1.8.10: |
2 | - Psyco is available only for x86 - do not use it on other architectures. | 6 | - Psyco is available only for x86 - do not use it on other architectures. |
3 | - Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530) | 7 | - Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530) |
diff --git a/bitbake/MANIFEST b/bitbake/MANIFEST index ae01faf8c3..0671f440bc 100644 --- a/bitbake/MANIFEST +++ b/bitbake/MANIFEST | |||
@@ -15,8 +15,10 @@ lib/bb/data.py | |||
15 | lib/bb/data_smart.py | 15 | lib/bb/data_smart.py |
16 | lib/bb/event.py | 16 | lib/bb/event.py |
17 | lib/bb/fetch/__init__.py | 17 | lib/bb/fetch/__init__.py |
18 | lib/bb/fetch/bzr.py | ||
18 | lib/bb/fetch/cvs.py | 19 | lib/bb/fetch/cvs.py |
19 | lib/bb/fetch/git.py | 20 | lib/bb/fetch/git.py |
21 | lib/bb/fetch/hg.py | ||
20 | lib/bb/fetch/local.py | 22 | lib/bb/fetch/local.py |
21 | lib/bb/fetch/perforce.py | 23 | lib/bb/fetch/perforce.py |
22 | lib/bb/fetch/ssh.py | 24 | lib/bb/fetch/ssh.py |
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 65ea5e5cad..0c708e3516 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py | |||
@@ -96,7 +96,7 @@ class Git(Fetch): | |||
96 | # Remove all but the .git directory | 96 | # Remove all but the .git directory |
97 | runfetchcmd("rm * -Rf", d) | 97 | runfetchcmd("rm * -Rf", d) |
98 | runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d) | 98 | runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d) |
99 | runfetchcmd("git pull --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d) | 99 | runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d) |
100 | runfetchcmd("git prune-packed", d) | 100 | runfetchcmd("git prune-packed", d) |
101 | runfetchcmd("git pack-redundant --all | xargs -r rm", d) | 101 | runfetchcmd("git pack-redundant --all | xargs -r rm", d) |
102 | 102 | ||
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 9d27d539c1..9d72d92fac 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -564,9 +564,9 @@ class RunQueue: | |||
564 | # Check to make sure we still have tasks to run | 564 | # Check to make sure we still have tasks to run |
565 | if len(self.runq_fnid) == 0: | 565 | if len(self.runq_fnid) == 0: |
566 | if not taskData.abort: | 566 | if not taskData.abort: |
567 | bb.msg.note(1, bb.msg.domain.RunQueue, "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.") | 567 | bb.msg.fatal(bb.msg.domain.RunQueue, "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.") |
568 | return | 568 | else: |
569 | bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.") | 569 | bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.") |
570 | 570 | ||
571 | bb.msg.note(2, bb.msg.domain.RunQueue, "Pruned %s inactive tasks, %s left" % (delcount, len(self.runq_fnid))) | 571 | bb.msg.note(2, bb.msg.domain.RunQueue, "Pruned %s inactive tasks, %s left" % (delcount, len(self.runq_fnid))) |
572 | 572 | ||