From 9ec4c25e31ad8d92d4a77194188cc0c046197cd4 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 6 Mar 2017 00:36:42 -0800 Subject: [PATCH] Address CR feedback License: MIT Signed-off-by: Jeromy --- core/commands/add.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/commands/add.go b/core/commands/add.go index 2b0478ebb20..e9e3bd87d12 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -144,10 +144,14 @@ You can now refer to the added file in a gateway, like so: silent, _, _ := req.Option(silentOptionName).Bool() chunker, _, _ := req.Option(chunkerOptionName).String() dopin, _, _ := req.Option(pinOptionName).Bool() - rawblks, _, _ := req.Option(rawLeavesOptionName).Bool() + rawblks, rbset, _ := req.Option(rawLeavesOptionName).Bool() nocopy, _, _ := req.Option(noCopyOptionName).Bool() fscache, _, _ := req.Option(fstoreCacheOptionName).Bool() + if nocopy && !rbset { + rawblks = true + } + if nocopy && !rawblks { res.SetError(fmt.Errorf("nocopy option requires '--raw-leaves' to be enabled as well"), cmds.ErrNormal) return @@ -167,7 +171,7 @@ You can now refer to the added file in a gateway, like so: } addblockstore := n.Blockstore - if !fscache && !nocopy { + if !(fscache || nocopy) { addblockstore = bstore.NewGCBlockstore(n.BaseBlocks, n.GCLocker) }