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.
cosmos · Aug 14, 2018 · 9997ea2 · 9997ea2
1 parent 8fa2c3b
commit 9997ea2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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