Changeset 125

Timestamp:

08/02/07 17:52:09 (17 years ago)

Author:

kdeugau

Message:

/trunk

Fix bug introduced with the %files code shuffle; %config files entries
didn't get macro expansion applied to the entry written to the conffile
list due to the processing order shuffle.

Fix hidden bug introduced with change in expansion of %specglobals bits;
%{_vendor} was no longer expanded with the change from "expand each key
once" to "while there are unexpanded macros, replace away".

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -1129 +1129 @@
       open CONFLIST, ">$buildroot/$pkg/DEBIAN/conffiles";
       foreach my $conffile (@{$pkgdata{$pkg}{conflist}}) {
+        $conffile = expandmacros($conffile, 'g');
         my @tmp = glob "$buildroot/$pkg/$conffile";
         foreach (@tmp) {
@@ -1579 +1580 @@
     $macrostring =~ s|%{_arch}|$hostarch|g;
     $macrostring =~ s|%{optflags}|$optflags{$hostarch}|g;
+    $macrostring =~ s|%{_vendor}|$specglobals{'_vendor'}|g;
 
 # should probably stick a "no runaway" flag in here...  Just In Case...