[csw-maintainers] GAR: New variable names (dependencies and noisaexec)

[Maciej (Matchek) Blizinski]

On Wed, Feb 3, 2010 at 6:54 PM, Maciej (Matchek) Blizinski
<maciej at opencsw.org> wrote:
> The change has been pushed in r8335[2].  Since all sources have been
> edited, including GAR, everything should Just Work(tm).

...except for cases where you have local modifications touching the
sections with changed variables.  If that happens, the general
strategy is: you can do the substitutions mentioned in the previous
e-mail in the file affected by code conflict; then you can throw out
the incoming change.  Then verify that the old variables don't lurk in
your code anywhere.

For instance, in the face of the following conflict...

<<<<<<< .mine
REQUIRED_PKGS_CSWsqlite3  = CSWsqlite3rt CSWpython-rt
REQUIRED_PKGS_CSWsqlite3 += CSWreadline
REQUIRED_PKGS_CSWsqlite3 += CSWncurses
REQUIRED_PKGS_CSWsqlite3devel = CSWsqlite3
=======
RUNTIME_DEP_PKGS_CSWsqlite3  = CSWsqlite3rt
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWncurses
RUNTIME_DEP_PKGS_CSWsqlite3devel = CSWsqlite3
>>>>>>> .r8335

...the actions would be: substitution...

<<<<<<< .mine
RUNTIME_DEP_PKGS_CSWsqlite3  = CSWsqlite3rt CSWpython-rt
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWncurses
RUNTIME_DEP_PKGS_CSWsqlite3devel = CSWsqlite3
=======
RUNTIME_DEP_PKGS_CSWsqlite3  = CSWsqlite3rt
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline
RUNTIME_DEP_PKGS_CSWsqlite3 += CSWncurses
RUNTIME_DEP_PKGS_CSWsqlite3devel = CSWsqlite3
>>>>>>> .r8335

...and deletion of everything between ======= and >>>>>>> .r8335.

Maciej