Changeset 185 for trunk

Timestamp:

06/07/15 11:50:22 (10 years ago)

Author:

kdeugau

Message:

/trunk

Allow empty packages, as long as they have something in the dependency list.

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -1256 +1256 @@
     }
 
-    # Skip building a package if it doesn't actually have any files.  NB:  This
-    # differs slightly from rpm's behaviour where a package *will* be built -
-    # even without any files - if %files is specified anywhere.  I can think
-    # of odd corner cases where that *may* be desireable.
-    next if (!$filelist{$pkg} or $filelist{$pkg} =~ /^\s*$/);
+    # Skip building a package that doesn't have any files or dependencies.  True
+    # metapackages don't have any files, but they depend on a bunch of things.
+    # Packages with neither have, essentially, no content.
+    next if 
+        (!$filelist{$pkg} or $filelist{$pkg} =~ /^\s*$/) &&
+        (!$pkgdata{$pkg}{requires});
+    $filelist{$pkg} = '' if !$filelist{$pkg};
 
     # Gotta do this first, otherwise we don't have a place to move files from %files
@@ -1266 +1268 @@
 
     # Eliminate any lingering % macros
-    $filelist{$pkg} = expandmacros $filelist{$pkg}, 'g';
+    $filelist{$pkg} = expandmacros $filelist{$pkg}, 'gp';
 
     my @pkgfilelist = split ' ', $filelist{$pkg};
@@ -1931 +1933 @@
     # ASS-U-ME and make life a little simpler.
     if ($macrostring =~ /\%\{\_\_([a-z0-9_-]+)\}/) {
+# see /usr/lib/rpm/macros for most of the list.  we should arguably just parse that file, but..  ow.
       $macrostring =~ s|%{__([a-z0-9_-]+)}|$1|g;
     }