From c635632955d3872d8dc1ccb5a86e60ae7685d757 Mon Sep 17 00:00:00 2001 From: Zahoor Mohamed Date: Thu, 8 Dec 2016 20:09:54 +0530 Subject: [PATCH 1/3] Fix for bzzup: trailing slash breaks uploader #3397 --- cmd/bzzup/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bzzup/main.go b/cmd/bzzup/main.go index 7d251aadb0..329f860c78 100644 --- a/cmd/bzzup/main.go +++ b/cmd/bzzup/main.go @@ -47,7 +47,7 @@ func main() { var ( file = flag.Arg(0) - client = &client{api: *bzzapiFlag} + client = &client{api: strings.TrimSuffix(*bzzapiFlag, "/")} mroot manifest ) fi, err := os.Stat(file) From b30aab463831634a368e925a0fb87d6a828bf02d Mon Sep 17 00:00:00 2001 From: Zahoor Mohamed Date: Wed, 21 Dec 2016 20:54:13 +0530 Subject: [PATCH 2/3] swarm config file options take precedence over command line arguments #3444 --- cmd/swarm/main.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 04930760ee..c4227d16ba 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -252,6 +252,10 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) { if len(bzzport) > 0 { bzzconfig.Port = bzzport } + networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name) + if networkId > 0 { + bzzconfig.NetworkId = networkId + } swapEnabled := ctx.GlobalBool(SwarmSwapEnabled.Name) syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabled.Name) From f449a0b13dd71b07e40fff5b089c7669ee695c30 Mon Sep 17 00:00:00 2001 From: Zahoor Mohamed Date: Sat, 24 Dec 2016 11:11:06 +0530 Subject: [PATCH 3/3] swarm: trouble loading manifest entries whose key ends in a slash '/' #3467 --- swarm/api/manifest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d6dc24c486..1d8df0d0b8 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -333,7 +333,7 @@ func RegularSlashes(path string) (res string) { } func (self *manifestTrie) getEntry(spath string) (entry *manifestTrieEntry, fullpath string) { - path := RegularSlashes(spath) + path := RegularSlashes(spath) + "/" var pos int quitC := make(chan bool) entry, pos = self.findPrefixOf(path, quitC)