Config refactor#137
Conversation
Replaced a bad path. On modern macOS, both `TARGET_OS_MAC` and `__APPLE__` can be visible. So the old "no fdopen()” path runs and the macro replaces fdopen() with NULL and corrupts it.
Same behaviour as ps3libraries - check Savannah, and if not, fall back on local copy
sys/utime.h declares utimbuf using time_t, but does not include a header that declares time_t. This breaks libraries that include <utime.h> directly, eg libnfs. Include <sys/types.h> earlier so the header is self-contained.
This reverts commit 9475164.
This reverts commit 93f2b6d.
|
Ugh. The commit message of the pushed commit is a mess. Also you included changes to Please give more than 5 minutes of time for peer reviews next time... |
|
The change to This was not a good merge. |
|
Sorry Marcus, I shouldn’t have let that through. What do you suggest we do? |
Sorry, my bad, 🙏 I missed some of the context from the previous PR thread. Next time if there's an ongoing thread I'll ping the original reviewers so things can be followed-up in a better way. |
Normally I'd say back it out with a force push, but it looks like those are blocked, and I can't figure out how to unblock them for admins only... So I guess we'll just have to live with it. But please do be more careful next time. |
|
I'm going to revert the change to |
@zeldin I think you should be able to enable force pushes for specific users under the repo settings, check here: I see an option at the end |
|
@bucanero Ah, sneaky. Before you click the checkbox it just says "Rules applied to everyone including administrators", so I didn't check the box since I didn't want it to apply to everyone... |
|
Ok, force pushed. @TheMrIron2 You can now restore your branch and clean it up (remove unrelated stuff, do a squash to fix up the commit message). I don't know if this PR can be reactivated or if you need to make a new one. Once the branch has been reviewed and merged again, you can rebase your other branch on the new master and it should remove everything already merged, so you are left with only stuff belonging to the other PR. |
3 participants
config refactor
Moved from #135 - refactors
config.guessandconfig.subretrieval.Attempts to contact Savannah for latest config, given timeout
CONFIG_TIMEOUT(default: 15s). If successful, use Savannah; if not, use local copy to avoid build stall or crash.This logic has additionally been moved to a separate script,
get-config-scripts.sh, in order to unify the logic. There's room for a faster implementation, but this improves the stability of the build process.