Do not ship empty folders (Fixes #53)

debomatic · Sep 24, 2021 · c546679 · c546679
1 parent 674a11d
commit c546679
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/sbuildcommands/build-deps-failed-commands/.gitignore b/sbuildcommands/build-deps-failed-commands/.gitignore
diff --git a/sbuildcommands/chroot-cleanup-commands/.gitignore b/sbuildcommands/chroot-cleanup-commands/.gitignore
diff --git a/sbuildcommands/post-build-commands/.gitignore b/sbuildcommands/post-build-commands/.gitignore
diff --git a/sbuildcommands/pre-build-commands/.gitignore b/sbuildcommands/pre-build-commands/.gitignore
diff --git a/setup.py b/setup.py
@@ -35,6 +35,34 @@
     call(['msgfmt', '-o', mo, po])
 
 
+class SbuildCommands():
+
+    def __init__(self):
+        self.directories = ('build-deps-failed-commands',
+                            'build-failed-commands',
+                            'chroot-cleanup-commands',
+                            'chroot-setup-commands',
+                            'finished-build-commands',
+                            'post-build-commands',
+                            'pre-build-commands',
+                            'starting-build-commands')
+
+    def __enter__(self):
+        for directory in self.directories:
+            try:
+                os.mkdir(os.path.join('sbuildcommands', directory))
+            except FileExistsError:
+                pass
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        for directory in self.directories:
+            try:
+                os.rmdir(os.path.join('sbuildcommands', directory))
+            except OSError:
+                pass
+
+
 class InstallData(install_data):
 
     def run(self):
@@ -44,17 +72,18 @@ def run(self):
         self.install_files('etc')
         self.install_files('lib')
         self.install_files('modules', 'share/debomatic')
-        self.install_files('sbuildcommands', 'share/debomatic')
+        with SbuildCommands() as sb:
+            self.install_files('sbuildcommands', 'share/debomatic', True)
         self.install_files('locale', 'share')
         install_data.run(self)
 
-    def install_files(self, rootdir, prefix=''):
+    def install_files(self, rootdir, prefix='', empty=False):
         filelist = []
         for root, subFolders, files in os.walk(rootdir):
             dirlist = []
             for file in files:
                 dirlist.append(os.path.join(root, file))
-            if dirlist:
+            if dirlist or empty:
                 filelist.append((os.path.join(prefix, root), dirlist))
         if not prefix:
             orig_prefix = self.install_dir