浏览代码

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
Richard Purdie 17 年之前
父节点
当前提交
6ac3680a2d
共有 4 个文件被更改,包括 10 次插入4 次删除
  1. 4 0
      bitbake/ChangeLog
  2. 2 0
      bitbake/MANIFEST
  3. 1 1
      bitbake/lib/bb/fetch/git.py
  4. 3 3
      bitbake/lib/bb/runqueue.py

+ 4 - 0
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)

+ 2 - 0
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

+ 1 - 1
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)
 

+ 3 - 3
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)))