Re: [PATCH] Uninstall configuration files when RM has spaces

On 06/12/2009 04:20 PM, Amos Jeffries wrote:
> Alex Rousskov wrote:
>> Hello,
>>
>> Make distuninstallcheck may fail because when we pass $(RM) to
>> scripts/remove-cfg.sh, the variable value is passed as two parameters:
>> rm and -f. The script expects it to be a single parameter.
>>
>> The earlier patch discussed below worked at the time of commit but
>> something has changed in my build environment or Squid: either $(RM) did
>> not have spaces before or those spaces were escaped automatically. My
>> understanding is that the attached patch would work in either case.
>
> Correct. We use identical quoting for other scripts.
>
> Please commit.

Committed to trunk. Please commit to v3.1 or let me know if I should (I
do not know if you have already closed v3.1 for direct commits like v3.0
has been closed).

Thank you,

Alex.

>> ---------- change log -------------
>> Make distuninstallcheck work when $(RM) contains spaces (e.g., rm -f).
>>
>> We must quote $(RM) value when passing it to scripts/remove-cfg.sh
>> The bug was detected by running test-builds.sh.
>> -----------------------------------
>>
>> Thank you,
>>
>> Alex.
>> bb:approve
>>
>>
>> On 02/27/2009 04:43 AM, Amos Jeffries wrote:
>>> Alex Rousskov wrote:
>>>> Hello,
>>>>
>>>> Please review the attached patch. The patched Makefiles delete
>>>> installed configuration files, restoring functionality removed from
>>>> Squid some time ago, but hopefully in a safer manner. This is the
>>>> cleanest way I could find to make "make distcheck" work again (with the
>>>> other pending SourceLayout changes).
>>>>
>>>> -------- change log ------------------
>>>> Made "make distuninstallcheck" work:
>>>>
>>>> Fixed "make distuninstallcheck" by removing installed configuration
>>>> files iff they are identical to the installed default configuration
>>>> files.
>>>>
>>>> Added scripts/remove-cfg.sh to do the safe removal because we need that
>>>> functionality in many Makefiles.
>>>>
>>>> Made installed mime.conf removal safe. We were removing it without
>>>> checking for modifications.
>>>>
>>>> Added commands to remove the following installed default configuration
>>>> files: cachemgr.conf.default and msntauth.conf.default.
>>>> --------------------------------------------
>>>>
>>>> Thank you,
>>>>
>>>> Alex.
>>>>
>>> Works for me too. I still have trouble with the translations, but am
>>> working on that now.
>>>
>>> Amos
>>
>
> Amos
Received on Sat Jun 13 2009 - 20:21:56 MDT