forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'bzz' of github.com:ethersphere/go-ethereum into bzz

Browse source
This commit is contained in:
zelig 2015-06-02 16:23:36 +01:00
commit 585b52c472
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bzz/api.go
View file

@ -292,8 +292,6 @@ func (self *Api) Upload(lpath, index string) (string, error) {
return "", errors[i] return "", errors[i]
} }
entry.Path = regularSlashes(entry.Path[start:]) entry.Path = regularSlashes(entry.Path[start:])
trie.addEntry(entry)
if entry.Path == index { if entry.Path == index {
ientry := &manifestTrieEntry{ ientry := &manifestTrieEntry{
Path: "", Path: "",
@ -302,6 +300,7 @@ func (self *Api) Upload(lpath, index string) (string, error) {
} }
trie.addEntry(ientry) trie.addEntry(ientry)
} }
trie.addEntry(entry)
} }
err2 := trie.recalcAndStore() err2 := trie.recalcAndStore()