Make install-results cope with old build-directories. #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When install-results moves the final output directories from .../.tmp/X to .../X, it fails if there's already a directory with the given name in its target directory; this arises when repeating a build. So remove any such conflicting directories from the destination, before trying to move their replacements in. At the same time, avoid repetition of long and tedious paths by using variables (which makes it easier to see which ones are the same and makes the differences easier to see) and skip spurious braces. Put all variable expansion inside quotes and ensure that names with odd things (like spaces) in them won't cause problems. Given that mkdir -p creates parents, one of the invocations of it could be skipped, as it made the parent of the next.
Author
|
Note that this is equivalent to: |
sudhirpandey
pushed a commit
that referenced
this pull request
Jan 28, 2014
Make install-results cope with old build-directories.
larsewi
added a commit
that referenced
this pull request
Sep 22, 2025
Failed to apply this patch after dependency upgrades. Maybe it's fixed, or maybe we need to reapply it to resolve conflicts. ``` 16:24:44 if [ "mingw" = mingw ]; then patch -p1 < "/home/jenkins/workspace/testing-pr/label/PACKAGES_i386_mingw/libcurl/pkg"/fix-curl-windows.patch; fi 16:24:44 patching file configure 16:24:44 Hunk #1 FAILED at 41895. 16:24:44 Hunk #2 succeeded at 48695 (offset 310 lines). 16:24:44 1 out of 2 hunks FAILED -- saving rejects to file configure.rej ``` This reverts commit d9a5956.
larsewi
added a commit
that referenced
this pull request
Sep 22, 2025
Failed to apply this patch after dependency upgrades. Maybe it's fixed, or maybe we need to reapply it to resolve conflicts. ``` 16:24:44 if [ "mingw" = mingw ]; then patch -p1 < "/home/jenkins/workspace/testing-pr/label/PACKAGES_i386_mingw/libcurl/pkg"/fix-curl-windows.patch; fi 16:24:44 patching file configure 16:24:44 Hunk #1 FAILED at 41895. 16:24:44 Hunk #2 succeeded at 48695 (offset 310 lines). 16:24:44 1 out of 2 hunks FAILED -- saving rejects to file configure.rej ``` This reverts commit 98a5126.
larsewi
added a commit
that referenced
this pull request
Sep 22, 2025
Failed to apply this patch after dependency upgrades. Maybe it's fixed, or maybe we need to reapply it to resolve conflicts. ``` 16:24:44 if [ "mingw" = mingw ]; then patch -p1 < "/home/jenkins/workspace/testing-pr/label/PACKAGES_i386_mingw/libcurl/pkg"/fix-curl-windows.patch; fi 16:24:44 patching file configure 16:24:44 Hunk #1 FAILED at 41895. 16:24:44 Hunk #2 succeeded at 48695 (offset 310 lines). 16:24:44 1 out of 2 hunks FAILED -- saving rejects to file configure.rej ``` This reverts commit 4512cfe.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When install-results moves the final output directories from
.../.tmp/X to .../X, it fails if there's already a directory with the
given name in its target directory; this arises when repeating a
build. So remove any such conflicting directories from the
destination, before trying to move their replacements in.
At the same time, avoid repetition of long and tedious paths by using
variables (which makes it easier to see which ones are the same and
makes the differences easier to see) and skip spurious braces. Put
all variable expansion inside quotes and ensure that names with odd
things (like spaces) in them won't cause problems.
Given that mkdir -p creates parents, one of the invocations of it
could be skipped, as it made the parent of the next.