# HG changeset patch # User Sascha Wilde # Date 1568730527 -7200 # Node ID 5826d4de0e40d1db0f6acea50db6f2b029df24d2 # Parent 3759b47f20f3dcde4731052885402d231e428ef7 Workarounds for incompatible upstream updates in pgx and cron packages. diff -r 3759b47f20f3 -r 5826d4de0e40 3rdpartylibs.sh --- a/3rdpartylibs.sh Tue Sep 17 16:08:45 2019 +0200 +++ b/3rdpartylibs.sh Tue Sep 17 16:28:47 2019 +0200 @@ -1,5 +1,14 @@ #!/bin/sh -go get -u -v github.com/jackc/pgx + +# pgx hase undergone some major incompatible changes in v4, +# we need to stick to v3 for now... +# Unfortunatly using gopkg.in does not work as expected here, so lets +# get hackisch... +go get -u -v gopkg.in/jackc/pgx.v3 +oldcwd="$CWD" +cd "$GOPATH"/src/github.com/jackc/pgx +git checkout v3.6.0 +cd "$oldcwd" # MIT go get -u -v github.com/etcd-io/bbolt/... @@ -32,7 +41,7 @@ go get -u -v github.com/jonas-p/go-shp # MIT -go get -u -v github.com/robfig/cron +go get -u -v gopkg.in/robfig/cron.v1 # MIT go get -u -v github.com/tidwall/rtree diff -r 3759b47f20f3 -r 5826d4de0e40 pkg/models/importbase.go --- a/pkg/models/importbase.go Tue Sep 17 16:08:45 2019 +0200 +++ b/pkg/models/importbase.go Tue Sep 17 16:28:47 2019 +0200 @@ -19,7 +19,7 @@ "time" "gemma.intevation.de/gemma/pkg/common" - "github.com/robfig/cron" + cron "gopkg.in/robfig/cron.v1" ) type ( diff -r 3759b47f20f3 -r 5826d4de0e40 pkg/scheduler/scheduler.go --- a/pkg/scheduler/scheduler.go Tue Sep 17 16:08:45 2019 +0200 +++ b/pkg/scheduler/scheduler.go Tue Sep 17 16:28:47 2019 +0200 @@ -19,7 +19,7 @@ "strings" "sync" - "github.com/robfig/cron" + cron "gopkg.in/robfig/cron.v1" ) // Action is called with a configuration id.