summaryrefslogtreecommitdiffstats
path: root/bitbake
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:48:14 +0100
commit86aeee98cffdc7c2f19e732467a69103d52fe16a (patch)
tree74b314de37c04eff1a2d7871ccaced80c05438b9 /bitbake
parent5c581b2610cb84362c00ee32754a87acfd15a64d (diff)
downloadpoky-86aeee98cffdc7c2f19e732467a69103d52fe16a.tar.gz
bitbake: 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. (Bitbake rev: 2ba23df5fad4b94d38a6aed97f7822226d72eb89) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/git.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 3676cc3ddc..384007c81f 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -204,7 +204,6 @@ class Git(FetchMethod):
204 needupdate = True 204 needupdate = True
205 if needupdate: 205 if needupdate:
206 try: 206 try:
207 runfetchcmd("%s remote prune origin" % ud.basecmd, d)
208 runfetchcmd("%s remote rm origin" % ud.basecmd, d) 207 runfetchcmd("%s remote rm origin" % ud.basecmd, d)
209 except bb.fetch2.FetchError: 208 except bb.fetch2.FetchError:
210 logger.debug(1, "No Origin") 209 logger.debug(1, "No Origin")