Unverified 提交 1f3a5fe4 作者: Whyrusleeping 提交者: GitHub

Merge pull request #4991 from ipfs/feat/git-plugin-default

plugin: preload git plugin by default
...@@ -172,7 +172,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) { ...@@ -172,7 +172,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
} }
if ok { if ok {
if _, err := loader.LoadPlugins(pluginpath); err != nil { if _, err := loader.LoadPlugins(pluginpath); err != nil {
log.Warning("error loading plugins: ", err) log.Error("error loading plugins: ", err)
} }
} }
......
...@@ -2,10 +2,13 @@ package loader ...@@ -2,10 +2,13 @@ package loader
import ( import (
"github.com/ipfs/go-ipfs/plugin" "github.com/ipfs/go-ipfs/plugin"
pluginipldgit "github.com/ipfs/go-ipfs/plugin/plugins/git"
) )
// DO NOT EDIT THIS FILE // DO NOT EDIT THIS FILE
// This file is being generated as part of plugin build process // This file is being generated as part of plugin build process
// To change it, modify the plugin/loader/preload.sh // To change it, modify the plugin/loader/preload.sh
var preloadPlugins = []plugin.Plugin{} var preloadPlugins = []plugin.Plugin{
pluginipldgit.Plugins[0],
}
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
# #
# name go-path number of the sub-plugin # name go-path number of the sub-plugin
#ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0 ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0
...@@ -17,11 +17,6 @@ fi ...@@ -17,11 +17,6 @@ fi
test_init_ipfs test_init_ipfs
test_expect_success "copy plugin" '
mkdir -p "$IPFS_PATH/plugins" &&
cp ../plugins/git.so "$IPFS_PATH/plugins/"
'
# from https://github.com/ipfs/go-ipld-git/blob/master/make-test-repo.sh # from https://github.com/ipfs/go-ipld-git/blob/master/make-test-repo.sh
test_expect_success "prepare test data" ' test_expect_success "prepare test data" '
tar xzf ../t0280-plugin-git-data/git.tar.gz tar xzf ../t0280-plugin-git-data/git.tar.gz
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论