Changeset 159

Timestamp:

02/01/11 17:38:34 (13 years ago)

Author:

kdeugau

Message:

/trunk

Move %{<program>} macro expansion before user-defined macro
expansion to reduce the number of bogus "uninitialized value
in substitution iterator" warnings

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -1718 +1718 @@
     $macrostring =~ s|%{_vendor}|$specglobals{'_vendor'}|g;
 
+    # system programs.  RPM uses a global config file for these;  we'll just
+    # ASS-U-ME and make life a little simpler.
+    if ($macrostring =~ /\%\{\_\_([a-z0-9_-]+)\}/) {
+      $macrostring =~ s|%{__([a-z0-9_-]+)}|$1|g;
+    }
+
 # should probably stick a "no runaway" flag in here...  Just In Case...
     # %define's
@@ -1726 +1732 @@
       $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
-    # ASS-U-ME and make life a little simpler.
-    if ($macrostring =~ /\%\{\_\_([a-z0-9_-]+)\}/) {
-      $macrostring =~ s|%{__([a-z0-9_-]+)}|$1|g;
     }