From 14fa7c18cca1d79840adc72a169cc4af2246977c Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Thu, 6 Jul 2017 19:39:06 -0700 Subject: [PATCH] deploy-ng: Fix so whole directories can be skipped instead of skipping each file in a directory --- direct/src/showutil/dist.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/showutil/dist.py b/direct/src/showutil/dist.py index a2c9e869de..2f62ee3341 100644 --- a/direct/src/showutil/dist.py +++ b/direct/src/showutil/dist.py @@ -271,7 +271,7 @@ class build_apps(distutils.core.Command): def dir_has_files(directory): files = [ i for i in os.listdir(directory) - if not check_pattern(os.path.join(directory, i)) + if check_pattern(os.path.join(directory, i)) ] return bool(files) @@ -308,7 +308,9 @@ class build_apps(distutils.core.Command): d = os.path.join(dst, item) if os.path.isfile(s): copy_file(s, d) - elif dir_has_files(s): + elif not dir_has_files(s): + print("skipping directory", os.path.normpath(s)) + else: copy_dir(s, d) for path in self.copy_paths: