summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-02-05 14:11:25 -0800
committerSaul Wold <sgw@linux.intel.com>2011-02-05 14:14:21 -0800
commit192f631129e25b959d501c46c3156b7037b49c22 (patch)
treedb173381daddd0a5cf2e1a1a8aadeb382cd6bd60 /bitbake/lib/bb/fetch2
parent96810cade04cad44d70a7c6e51aacdf89caef92b (diff)
downloadopenembedded-core-192f631129e25b959d501c46c3156b7037b49c22.tar.gz
openembedded-core-192f631129e25b959d501c46c3156b7037b49c22.tar.bz2
openembedded-core-192f631129e25b959d501c46c3156b7037b49c22.tar.xz
openembedded-core-192f631129e25b959d501c46c3156b7037b49c22.zip
fetch2/git.py: Fix problem when fetching with no origin
When updating a git repo, its possible to not have an origin, so fail gracefully with a debug message. Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/git.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index ec20d262a..ba8126f00 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -127,8 +127,12 @@ class Git(Fetch):
needupdate = True
if needupdate:
bb.fetch2.check_network_access(d, "git fetch %s%s" % (ud.host, ud.path))
- runfetchcmd("%s remote prune origin" % ud.basecmd, d)
- runfetchcmd("%s remote rm origin" % ud.basecmd, d)
+ 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")
+
runfetchcmd("%s remote add origin %s://%s%s%s" % (ud.basecmd, ud.proto, username, ud.host, ud.path), d)
runfetchcmd("%s fetch --all -t" % ud.basecmd, d)
runfetchcmd("%s prune-packed" % ud.basecmd, d)