Commits on Aug 3, 2018

1. New rpmExpandMacrosAt API with location information. …

   The macro expansion API lacks location information for warnings.
   The simplest way to add this information is to pass location
   information to a new macro expansion API and for that location
   to be used in subsequence diagonistics.
   
   A new 'struct rpmSpecLocation_s' structure is created to hold the
   location information. A new API rpmExpandMacrosAt() is created
   which operates exactly like rpmExpandMacros() but takes an
   additional first argument of type 'rpmSpecLoc' and uses this
   information when printing warnings and errors.
   
   Example warning without the patch:
   [carlos@localhost SPECS]$ rpmbuild -bs glibc.spec
   warning: Macro %pie needs whitespace before body
   Wrote: /home/carlos/rpmbuild/SRPMS/glibc-2.28-3.fc29.src.rpm
   
   Example warning with the patch:
   [carlos@localhost SPECS]$ rpmbuild -bs glibc.spec
   warning: line 66: Macro %pie needs whitespace before body
   Wrote: /home/carlos/rpmbuild/SRPMS/glibc-2.28-3.fc29.src.rpm
   
   Notice with the patch 'line 66' is immediately called out at
   the location of the macro being expanded, this allows developers
   to immediately find the problem.
   
   A solution of a new API with a new location structure was chosen
   to minimize the impact on existing structures, APIs, and information
   leakage across library boundaries. For example it might have been
   convenient to pass the whole rpmSpec to the macro expansion, but
   this would have required making the opaque type visible to the
   macro expansion code, and may have resulted in maintenance
   difficulties. Lastly, even if we extended rpmMacroEntry to contain
   location information, we would still need to pass it from the spec
   file parsing down, and so could not avoid some other kind of
   interface. In the case of rpmMacroContext, adding the current
   location to the structure seemed fragile since the context contains
   many macros all which can come from different places. Perhaps the
   best solution is to eventually expand rpmMacroEntry to record the
   location passed by rpmExpandMacrosAt() in order to use it in the
   display and dumping of the macro context.
   
   No regressions on x86_64, tested in Fedora Rawhide by using make
   dist, integrating the new tarball into the fedora build and then
   testing that out to build glibc.spec.

   

   codonell committed Aug 3, 2018
   Configuration menu

   • View commit details
   • Copy full SHA for a6bc8d4
   • Browse repository at this point

   Copy the full SHA

   a6bc8d4 View commit details

   Browse the repository at this point in the history