From 9997ea22439bdaf374a163716e33f5aa09302662 Mon Sep 17 00:00:00 2001 From: Dev Ojha Date: Tue, 14 Aug 2018 01:35:08 -0700 Subject: [PATCH] Merge PR #2016: dep: Fix error with scratch directory If dep already sees its scratch directory (.vendor-new), dep ensure fails. This rm -rf's that directory so make get_vendor_deps doesn't fail. --- Makefile | 1 + PENDING.md | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index a280a5f1f..e0336aeb4 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ get_dev_tools: get_vendor_deps: @echo "--> Running dep ensure" + @rm -rf .vendor-new @dep ensure -v draw_deps: diff --git a/PENDING.md b/PENDING.md index a20dac238..d52799496 100644 --- a/PENDING.md +++ b/PENDING.md @@ -74,6 +74,7 @@ IMPROVEMENTS * [x/stake] \#1815 Sped up the processing of `EditValidator` txs. * [server] \#1930 Transactions indexer indexes all tags by default. * [x/stake] \#2000 Added tests for new staking endpoints +* [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present. BUG FIXES * \#1666 Add intra-tx counter to the genesis validators