From 299b90b0bdfc67cad92c56659de72a8bbd11e878 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Mon, 20 Mar 2017 11:12:03 -0700 Subject: [PATCH] Makefile: Restore vendor directory after dep-validate Currently, this target makes changes to the vendor directory, which may overwrite local changes or cause build errors. It's better to restore the original vendor directory after running the check. Signed-off-by: Aaron Lehmann --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 339bbc438..7c6f9c7a6 100644 --- a/Makefile +++ b/Makefile @@ -95,4 +95,5 @@ dep-validate: @$(VNDR) @test -z "$$(diff -r vendor .vendor.bak 2>&1 | tee /dev/stderr)" || \ (echo >&2 "+ inconsistent dependencies! what you have in vendor.conf does not match with what you have in vendor" && false) - @rm -Rf .vendor.bak + @rm -Rf vendor + @mv .vendor.bak vendor