diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-02-11 20:33:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-02-11 20:33:43 +0000 |
| commit | 6ac3680a2d61d2023c7800ba718c94cb6659750c (patch) | |
| tree | 3e688be73fef5cf802d794dc3d8158fd1b97389f /bitbake/lib | |
| parent | e6a50a8a3fa9a77050a53477f30dcd7e28bacf91 (diff) | |
| download | openembedded-core-6ac3680a2d61d2023c7800ba718c94cb6659750c.tar.gz openembedded-core-6ac3680a2d61d2023c7800ba718c94cb6659750c.tar.bz2 openembedded-core-6ac3680a2d61d2023c7800ba718c94cb6659750c.tar.xz openembedded-core-6ac3680a2d61d2023c7800ba718c94cb6659750c.zip | |
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
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/fetch/git.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
2 files changed, 4 insertions, 4 deletions
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))) |