[ARVADOS] updated: 17e388d6515cfd7f3bb527c982b925270b426419

[git at public.curoverse.com]

Summary of changes:
 docker/build_tools/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  17e388d6515cfd7f3bb527c982b925270b426419 (commit)
      from  8864cde017b9214b2e5383397b182f0b5f60334c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 17e388d6515cfd7f3bb527c982b925270b426419
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Aug 15 16:56:34 2014 -0400

    docker: be a bit smarter in the make clean target, so that we also
    accomodate diretories underneath the generated directory.
    
    refs #3551

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 7f3ad69..f3dd90c 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -7,7 +7,6 @@ endif
 all: skydns-image skydock-image api-image compute-image doc-image workbench-image keep-image sso-image shell-image
 
 IMAGE_FILES := $(shell ls *-image 2>/dev/null |grep -v -E 'debian-arvados-image|skydns-image|skydock-image')
-GENERATED_FILES := $(shell ls */generated/* 2>/dev/null)
 GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
 
 # `make clean' removes the files generated in the build directory
@@ -15,8 +14,8 @@ GENERATED_DIRS := $(shell ls */generated 2>/dev/null)
 clean:
 	@echo "make clean"
 	- at rm -rf build
-	+@[ "$(IMAGE_FILES)$(GENERATED_FILES)" = "" ] || rm $(IMAGE_FILES) $(GENERATED_FILES) 2>/dev/null
-	+@[ "$(GENERATED_DIRS)" = "" ] || rmdir */generated 2>/dev/null
+	+@[ "$(IMAGE_FILES)" = "" ] || rm -f $(IMAGE_FILES) 2>/dev/null
+	+@[ "$(GENERATED_DIRS)" = "" ] || rm -rf */generated 2>/dev/null
 
 DEBIAN_IMAGE := $(shell $(DOCKER) images -q arvados/debian |head -n1)
 

-----------------------------------------------------------------------


hooks/post-receive
--