summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-06-30 21:34:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-04 14:41:18 +0100
commit2ba23df5fad4b94d38a6aed97f7822226d72eb89 (patch)
treebcebe0ad72a4157ae89d0762507e9ae3b725c840
parent0d24b1e85a11b68c8464cf15b49d3fc78f216818 (diff)
downloadbitbake-2ba23df5fad4b94d38a6aed97f7822226d72eb89.tar.gz
git: do not execute 'git remote prune'
'git remote prune' at this location does not make much sense because the following 'git remote rm' will prune stale and non-stale branches. The 'prune' can cause trouble because it will access the network bypassing the no-network code in bitbake. When this operation fails and throws an exception, the next command (--> 'git remote rm') will be skipped. This in turn, will make all the following operations fail, because they assume that the remote does not exist yet. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/git.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 3676cc3dd..384007c81 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -204,7 +204,6 @@ class Git(FetchMethod):
needupdate = True
if needupdate:
try:
- runfetchcmd("%s remote prune origin" % ud.basecmd, d)
runfetchcmd("%s remote rm origin" % ud.basecmd, d)
except bb.fetch2.FetchError:
logger.debug(1, "No Origin")