Fix regression from "newapkbuild: remove obsolete cd statements " #75
Conversation
This file contains 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
|
@ncopa: getting this in before freezing abuild would be important. |
|
Not that I know much shell, but wouldn't doing |
added 2 commits
June 6, 2019 22:01
Since the obsolete 'cd "$builddir"' statements have been removed in [1],
build(), check() and package() can generate empty functions if no build
system is specified or if there is no default for the given build
system. newapkbuild will then fail, as it tries to parse the script it
generated:
$ cd /home/pmos && newapkbuild test
/usr/bin/abuild: /home/pmos/test/APKBUILD: line 18: syntax error: unexpected "}"
$ cat test/APKBUILD
...
build() {
}
...
Fix this by placing ":" in functions that would be empty.
[1]: f83d19c
Add a '# Check sections' comment, for consistency with the equally commented build and package sections.
ollieparanoid
force-pushed
the
fix-empty-func-regression
branch
from
784ef74
to
3cdbae8
Compare
Sure, updated to use @ncopa, can you take a look at this regression fix? |
|
Merged in 635a699, da4aca2 by @ncopa. Thanks for your contribution! (This pull request has been closed automatically by GitHub PR Closer. If you think that it’s not resolved yet, please add a comment.) |
z3ntu
pushed a commit
to z3ntu/pmbootstrap
that referenced
this pull request
Jul 20, 2019
Half of this test is failing, because of a regression in newapkbuild. This patch will fix it: alpinelinux/abuild#75 Until then, let's disable this test, so our testsuite runs through again. If somebody is curious on how I've developed and tested this patch with pmbootstrap, I've added a guide to the wiki: https://wiki.postmarketos.org/wiki/Hacking_on_abuild
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since the obsolete 'cd "$builddir"' statements have been removed in f83d19c, build(), check() and package() can generate empty functions if no build system is specified or if there is no default for the given build system. newapkbuild will then fail, as it tries to parse the script it generated:
Fix this by placing "true" in functions that would be empty.