From 6ac3680a2d61d2023c7800ba718c94cb6659750c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 11 Feb 2008 20:33:43 +0000
Subject: 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
---
 bitbake/ChangeLog           | 4 ++++
 bitbake/MANIFEST            | 2 ++
 bitbake/lib/bb/fetch/git.py | 2 +-
 bitbake/lib/bb/runqueue.py  | 6 +++---
 4 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index 72ef22d61..7e6b7b26a 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -1,3 +1,7 @@
+Changes in BitBake 1.8.x:
+	- Fix exit code for build failures in --continue mode
+	- Fix git branch tags fetching
+
 Changes in BitBake 1.8.10:
 	- Psyco is available only for x86 - do not use it on other architectures.
 	- 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 ae01faf8c..0671f440b 100644
--- a/bitbake/MANIFEST
+++ b/bitbake/MANIFEST
@@ -15,8 +15,10 @@ lib/bb/data.py
 lib/bb/data_smart.py
 lib/bb/event.py
 lib/bb/fetch/__init__.py
+lib/bb/fetch/bzr.py
 lib/bb/fetch/cvs.py
 lib/bb/fetch/git.py
+lib/bb/fetch/hg.py
 lib/bb/fetch/local.py
 lib/bb/fetch/perforce.py
 lib/bb/fetch/ssh.py
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 65ea5e5ca..0c708e351 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -96,7 +96,7 @@ class Git(Fetch):
         # Remove all but the .git directory
         runfetchcmd("rm * -Rf", d)
         runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d)
-        runfetchcmd("git pull --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
+        runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
         runfetchcmd("git prune-packed", d)
         runfetchcmd("git pack-redundant --all | xargs -r rm", d)
 
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 9d27d539c..9d72d92fa 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -564,9 +564,9 @@ class RunQueue:
         # Check to make sure we still have tasks to run
         if len(self.runq_fnid) == 0:
             if not taskData.abort:
-                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.")
-                return
-            bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.")
+                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.")
+            else:		
+                bb.msg.fatal(bb.msg.domain.RunQueue, "No active tasks and not in --continue mode?! Please report this bug.")
 
         bb.msg.note(2, bb.msg.domain.RunQueue, "Pruned %s inactive tasks, %s left" % (delcount, len(self.runq_fnid)))
 
-- 
cgit v1.2.3