MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

update.py: add -p to git fetch

Browse Source 
-p, --prune
    Before fetching, remove any remote-tracking references that no longer exist on the remote.

Fixed:
$ git push origin :test_branch
$ ./update.py

The test_branch was still in fetched local repo which was incorrect, it should
be gone since it has been removed by upstream.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Robert Yang 2017-05-19 01:09:36 -07:00 committed by Paul Eggleton
parent b478ff069e
commit f6cb14678b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layerindex/update.py
View File

@ -264,7 +264,7 @@ def main():
if not os.path.exists(repodir): if not os.path.exists(repodir):
out = utils.runcmd("git clone %s %s" % (layer.vcs_url, urldir), fetchdir, logger=logger, printerr=False) out = utils.runcmd("git clone %s %s" % (layer.vcs_url, urldir), fetchdir, logger=logger, printerr=False)
else: else:
out = utils.runcmd("git fetch", repodir, logger=logger, printerr=False) out = utils.runcmd("git fetch -p", repodir, logger=logger, printerr=False)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logger.error("Fetch of layer %s failed: %s" % (layer.name, e.output)) logger.error("Fetch of layer %s failed: %s" % (layer.name, e.output))
failedrepos[layer.vcs_url] = e.output failedrepos[layer.vcs_url] = e.output
@ -279,7 +279,7 @@ def main():
if not os.path.exists(bitbakepath): if not os.path.exists(bitbakepath):
out = utils.runcmd("git clone %s %s" % (settings.BITBAKE_REPO_URL, 'bitbake'), fetchdir, logger=logger) out = utils.runcmd("git clone %s %s" % (settings.BITBAKE_REPO_URL, 'bitbake'), fetchdir, logger=logger)
else: else:
out = utils.runcmd("git fetch", bitbakepath, logger=logger) out = utils.runcmd("git fetch -p", bitbakepath, logger=logger)
if options.actual_branch: if options.actual_branch:
update_actual_branch(layerquery, fetchdir, branches[0], options, update_bitbake, bitbakepath) update_actual_branch(layerquery, fetchdir, branches[0], options, update_bitbake, bitbakepath)