summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-11 20:33:43 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-11 20:33:43 +0000
commit6ac3680a2d61d2023c7800ba718c94cb6659750c (patch)
tree3e688be73fef5cf802d794dc3d8158fd1b97389f
parente6a50a8a3fa9a77050a53477f30dcd7e28bacf91 (diff)
downloadpoky-6ac3680a2d61d2023c7800ba718c94cb6659750c.tar.gz
bitbake: Sync with upstream 1.8 branch for git fetcher and --continue mode fix
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3761 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake/ChangeLog4
-rw-r--r--bitbake/MANIFEST2
-rw-r--r--bitbake/lib/bb/fetch/git.py2
-rw-r--r--bitbake/lib/bb/runqueue.py6
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 @@
1Changes in BitBake 1.8.x:
2 - Fix exit code for build failures in --continue mode
3 - Fix git branch tags fetching
4
1Changes in BitBake 1.8.10: 5Changes 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
15lib/bb/data_smart.py 15lib/bb/data_smart.py
16lib/bb/event.py 16lib/bb/event.py
17lib/bb/fetch/__init__.py 17lib/bb/fetch/__init__.py
18lib/bb/fetch/bzr.py
18lib/bb/fetch/cvs.py 19lib/bb/fetch/cvs.py
19lib/bb/fetch/git.py 20lib/bb/fetch/git.py
21lib/bb/fetch/hg.py
20lib/bb/fetch/local.py 22lib/bb/fetch/local.py
21lib/bb/fetch/perforce.py 23lib/bb/fetch/perforce.py
22lib/bb/fetch/ssh.py 24lib/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