Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleaner: recursively delete info dirs #11597

Merged
merged 1 commit into from Jun 25, 2021

Conversation

gromgit
Copy link
Member

@gromgit gromgit commented Jun 25, 2021

Arch-specific build tool formulae (Homebrew/homebrew-core#79874) install their info files in #{info}/<arch> to avoid conflicts with the main tool formulae.

However, the info cleaner only removes #{info}/dir, so each tool's bottle includes #{info}/<arch>/dir, which causes install-time conflicts.

This PR fixes that by deleting all dirs under #{info}.

Before (#{info}/dir):

==> Cleaning
[...]
==> Fixing /usr/local/Cellar/grep/3.6/bin/ggrep permissions from 755 to 555
rm /usr/local/Cellar/grep/3.6/share/info/dir
==> Finishing up

After (#{info}/dir) -- no change:

==> Cleaning
[...]
==> Fixing /usr/local/Cellar/grep/3.6/bin/ggrep permissions from 755 to 555
rm /usr/local/Cellar/grep/3.6/share/info/dir
==> Finishing up

Before (#{info}/<arch>/dir):

==> Cleaning
[...]
==> Fixing /usr/local/Cellar/i686-elf-binutils/2.36.1_1/lib/i686-elf/bfd-plugins/libdep.so permissions from 755 to 444
==> Finishing up

After (#{info}/<arch>/dir) -- now removed:

==> Cleaning
[...]
==> Fixing /usr/local/Cellar/i686-elf-binutils/2.36.1_1/lib/i686-elf/bfd-plugins/libdep.so permissions from 755 to 444
rm /usr/local/Cellar/i686-elf-binutils/2.36.1_1/share/info/i686-elf/dir
==> Finishing up
  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew typecheck with your changes locally?
  • Have you successfully run brew tests with your changes locally?

Arch-specific build tool formulae (Homebrew/homebrew-core#79874) install their info files in `#{info}/<arch>` to avoid conflicts with the main tool formulae.

However, the info cleaner only removes `#{info}/dir`, so each tool's bottle includes `#{info}/<arch>/dir`, which causes install-time conflicts.

This PR fixes that by deleting all `dir`s under `#{info}`.

Before:
```
==> Cleaning
[...]
==> Fixing /usr/local/Cellar/i686-elf-binutils/2.36.1_1/lib/i686-elf/bfd-plugins/libdep.so permissions from 755 to 444
==> Finishing up
```

After:
```
==> Cleaning
[...]
==> Fixing /usr/local/Cellar/i686-elf-binutils/2.36.1_1/lib/i686-elf/bfd-plugins/libdep.so permissions from 755 to 444
rm /usr/local/Cellar/i686-elf-binutils/2.36.1_1/share/info/i686-elf/dir
==> Finishing up
```
@BrewTestBot
Copy link
Member

Review period will end on 2021-06-28 at 05:42:57 UTC.

@BrewTestBot BrewTestBot added the waiting for feedback Merging is blocked until sufficient time has passed for review label Jun 25, 2021
Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thanks again @gromgit!

@MikeMcQuaid MikeMcQuaid added the critical Critical change which should be shipped as soon as possible. label Jun 25, 2021
@BrewTestBot BrewTestBot removed the waiting for feedback Merging is blocked until sufficient time has passed for review label Jun 25, 2021
@BrewTestBot
Copy link
Member

Review period skipped due to critical label.

@MikeMcQuaid MikeMcQuaid merged commit 91f2114 into Homebrew:master Jun 25, 2021
@gromgit gromgit deleted the cleanup_all_info_dir branch June 25, 2021 11:55
@github-actions github-actions bot added the outdated PR was locked due to age label Jul 26, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 26, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
critical Critical change which should be shipped as soon as possible. outdated PR was locked due to age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants