Browse Source

deploy-ng: Fix so whole directories can be skipped instead of skipping each file in a directory

Mitchell Stokes 8 years ago
parent
commit
14fa7c18cc
1 changed files with 4 additions and 2 deletions
  1. 4 2
      direct/src/showutil/dist.py

+ 4 - 2
direct/src/showutil/dist.py

@@ -271,7 +271,7 @@ class build_apps(distutils.core.Command):
         def dir_has_files(directory):
         def dir_has_files(directory):
             files = [
             files = [
                 i for i in os.listdir(directory)
                 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)
             return bool(files)
 
 
@@ -308,7 +308,9 @@ class build_apps(distutils.core.Command):
                 d = os.path.join(dst, item)
                 d = os.path.join(dst, item)
                 if os.path.isfile(s):
                 if os.path.isfile(s):
                     copy_file(s, d)
                     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)
                     copy_dir(s, d)
 
 
         for path in self.copy_paths:
         for path in self.copy_paths: