Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2018-12-09 00:18:32 +01:00
commit fbb7b04a85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
84 changed files with 1059 additions and 638 deletions

View file

@ -2869,6 +2869,14 @@ transforms idiomatic python function calls to well-formed SQL queries.")
(delete-file-recursively
"src/github.com/mongodb/mongo-tools/vendor")
#t))
(add-after 'delete-bundled-source-code 'patch-source
(lambda _
;; Remove a redundant argument that causes compilation to fail.
(substitute*
"src/github.com/mongodb/mongo-tools/mongorestore/filepath.go"
(("skipping restore of system.profile collection\", db)")
"skipping restore of system.profile collection\")"))
#t))
;; We don't need to install the source code for end-user applications
(delete 'install-source)
(replace 'build