summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/git.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 2ce9395f50..dcecff5d38 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -236,7 +236,7 @@ class Git(FetchMethod):
236 ud.unresolvedrev[name] = ud.revisions[name] 236 ud.unresolvedrev[name] = ud.revisions[name]
237 ud.revisions[name] = self.latest_revision(ud, d, name) 237 ud.revisions[name] = self.latest_revision(ud, d, name)
238 238
239 gitsrcname = '%s%s' % (ud.host.replace(':', '.'), ud.path.replace('/', '.').replace('*', '.')) 239 gitsrcname = '%s%s' % (ud.host.replace(':', '.'), ud.path.replace('/', '.').replace('*', '.').replace(' ','_'))
240 if gitsrcname.startswith('.'): 240 if gitsrcname.startswith('.'):
241 gitsrcname = gitsrcname[1:] 241 gitsrcname = gitsrcname[1:]
242 242
@@ -342,7 +342,7 @@ class Git(FetchMethod):
342 # We do this since git will use a "-l" option automatically for local urls where possible 342 # We do this since git will use a "-l" option automatically for local urls where possible
343 if repourl.startswith("file://"): 343 if repourl.startswith("file://"):
344 repourl = repourl[7:] 344 repourl = repourl[7:]
345 clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, repourl, ud.clonedir) 345 clone_cmd = "LANG=C %s clone --bare --mirror \"%s\" %s --progress" % (ud.basecmd, repourl, ud.clonedir)
346 if ud.proto.lower() != 'file': 346 if ud.proto.lower() != 'file':
347 bb.fetch2.check_network_access(d, clone_cmd, ud.url) 347 bb.fetch2.check_network_access(d, clone_cmd, ud.url)
348 progresshandler = GitProgressHandler(d) 348 progresshandler = GitProgressHandler(d)
@@ -354,8 +354,8 @@ class Git(FetchMethod):
354 if "origin" in output: 354 if "origin" in output:
355 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) 355 runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
356 356
357 runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir) 357 runfetchcmd("%s remote add --mirror=fetch origin \"%s\"" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
358 fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, repourl) 358 fetch_cmd = "LANG=C %s fetch -f --progress \"%s\" refs/*:refs/*" % (ud.basecmd, repourl)
359 if ud.proto.lower() != 'file': 359 if ud.proto.lower() != 'file':
360 bb.fetch2.check_network_access(d, fetch_cmd, ud.url) 360 bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
361 progresshandler = GitProgressHandler(d) 361 progresshandler = GitProgressHandler(d)
@@ -501,7 +501,7 @@ class Git(FetchMethod):
501 raise bb.fetch2.UnpackError("No up to date source found: " + "; ".join(source_error), ud.url) 501 raise bb.fetch2.UnpackError("No up to date source found: " + "; ".join(source_error), ud.url)
502 502
503 repourl = self._get_repo_url(ud) 503 repourl = self._get_repo_url(ud)
504 runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d, workdir=destdir) 504 runfetchcmd("%s remote set-url origin \"%s\"" % (ud.basecmd, repourl), d, workdir=destdir)
505 505
506 if self._contains_lfs(ud, d, destdir): 506 if self._contains_lfs(ud, d, destdir):
507 if need_lfs and not self._find_git_lfs(d): 507 if need_lfs and not self._find_git_lfs(d):
@@ -613,7 +613,7 @@ class Git(FetchMethod):
613 d.setVar('_BB_GIT_IN_LSREMOTE', '1') 613 d.setVar('_BB_GIT_IN_LSREMOTE', '1')
614 try: 614 try:
615 repourl = self._get_repo_url(ud) 615 repourl = self._get_repo_url(ud)
616 cmd = "%s ls-remote %s %s" % \ 616 cmd = "%s ls-remote \"%s\" %s" % \
617 (ud.basecmd, repourl, search) 617 (ud.basecmd, repourl, search)
618 if ud.proto.lower() != 'file': 618 if ud.proto.lower() != 'file':
619 bb.fetch2.check_network_access(d, cmd, repourl) 619 bb.fetch2.check_network_access(d, cmd, repourl)