Changeset 116

Timestamp:

07/19/07 15:27:16 (17 years ago)

Author:

kdeugau

Message:

/trunk

Refix macro expansion fix from r114. Really.
(Make sure we recursively expand %specglobal macros - mostly from
%defines, re-complexify parts of the %if-construct expansion so
that it actually, um, expands.)

File:

• trunk/debbuild (modified) (4 diffs)

trunk/debbuild

@@ -1494 +1494 @@
     $macrostring =~ s'%{_datadir}'/usr/share'g;
 
-    # %define's
-    foreach my $key (keys %specglobals) {
-      $macrostring =~ s|%{$key}|$specglobals{$key}|g;
-    }
-
     # special %define's.  Handle the general case where we eval anything.
     # Even more general:  %(...) is a spec-parse-time shell code wrapper.
@@ -1515 +1510 @@
     # there's no value specified...  but so does rpm.
 my $tmpcount = 0;
-    while ($macrostring =~ /(\%\{(!\?|\?!|\?)([a-z0-9_.-]+)(?:\:([a-z0-9_.-]+))?\})/g) {       #Whew....
-      my $wholemacro = $1;      # Just for precision when replacing content in multimacro lines...
-      my $qex = $2;
-      my $macro = $3;
-      my $value = $4;
+    while ($macrostring =~ /\%\{(!\?|\?!|\?)([a-z0-9_.-]+)(?:\:([a-z0-9_.-]+))?\}/g) {       #Whew....
+      my $qex = $1;
+      my $macro = $2;
+      my $value = $3;
 
       my $neg = '1' if $qex =~ /\!/;
@@ -1527 +1521 @@
         $value = '' if !$neg;
       }
-      $macrostring =~ s/$wholemacro/$value/;
+      $macrostring =~ s/\%\{!?\?\!?[a-z0-9_.-]+(?:\:[a-z0-9_.-]+)?\}/$value/;
 
 # not certain about this, but I don't want to run away.  It *can* happen if planned carefully.  :/
@@ -1534 +1528 @@
 
     } # while()
+
+# should probably stick a "no runaway" flag in here...  Just In Case...
+    # %define's
+    while (my ($key) = ($macrostring =~ /%{([a-z0-9]+)}/i) ) {
+      $macrostring =~ s|%{$key}|$specglobals{$key}|g;
+                # wanna limit this to "... if $specglobals{$key}", but need more magic
+    }
 
     # system programs.  RPM uses a global config file for these;  we'll just