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

This commit is contained in:
zelig 2015-06-02 16:23:36 +01:00
commit 585b52c472

View file

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