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

Move Fedora's brp-mangle-shebangs from fedora-python/brp-mangle-shebangs #2

Merged
merged 10 commits into from Nov 19, 2018

Conversation

hroncok
Copy link
Contributor

@hroncok hroncok commented Nov 16, 2018

Also, please activate Travis CI for this repository.

@Conan-Kudo
Copy link
Member

@hroncok We probably won't use Travis CI here. RPM itself uses Semaphore CI, and we will likely do the same for this.

@hroncok
Copy link
Contributor Author

hroncok commented Nov 16, 2018

Whatever CI you want. Just please have some. Our repo had it and I'm moving this here as requested in https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/31

@Conan-Kudo
Copy link
Member

@hroncok You know this repo isn't packaged, right?

@hroncok
Copy link
Contributor Author

hroncok commented Nov 16, 2018

yes, the file lives in dist git of redhat-rpm-config. I just happen to have tests for it that nobody wants, so I created my own "upstream" and wanted a link to that upstream in redhat-rpm-config spec, so whoever changes the brp script is aware of the tests, but the link was rejected, such scripts already have a repo and that is this one.

All I really want is a place where the tests can be and than a link in the spec that links to them + a place where people can send changes and have the tests be run.

@Conan-Kudo
Copy link
Member

@hroncok Other than the Travis CI commit, this looks fine to me. Can you please remove the Travis CI commit and rebase on current master?

@hroncok
Copy link
Contributor Author

hroncok commented Nov 19, 2018

Like this or even more rebasing? Note that it will not be trivial (there are files that conflict before I move them around, so I'd need to filter branch or something).

@hroncok hroncok changed the title Move Fedora's brp-mangle-shebangs fromfedora-python/brp-mangle-shebangs Move Fedora's brp-mangle-shebangs from fedora-python/brp-mangle-shebangs Nov 19, 2018
@Conan-Kudo
Copy link
Member

@hroncok Basically, git rebase upstream/master. Though I'm not sure how this branch is set up as it is...

@hroncok
Copy link
Contributor Author

hroncok commented Nov 19, 2018

Rebased manually commit by commit. Better now?

@hroncok
Copy link
Contributor Author

hroncok commented Nov 19, 2018

Actually, wait a minute or five.

hroncok and others added 10 commits November 19, 2018 23:30
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Reported-by: Jun Aruga <jaruga@redhat.com>
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1541057
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Introduces __brp_mangle_shebangs_exclude_from and __brp_mangle_shebangs_exclude

 * the first allows to explude specific paths from the mangling
 * the second allows to exlude specific shebangs

Both are used with `grep -E`. Similar escaping rules as in [1] apply.

[1] https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
Now it starts requiring bash instead of POSIX-compatible shell, but this
is not a problem since other scripts in here do same.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This patch adds two additional rpm macros, __brp_mangle_shebangs_exclude_file
and __brp_mangle_shebangs_exclude_from_file, to specify files from which
to read the extended regexps used for excluding shebangs and target
files.

Additionally, this adds documentation in the macros file and
--help/--usage/-?/-h to brp-mangle-shebangs, so that it's possible to
actually discover what the intended behavior is without reading the
script itself.

Signed-off-by: Peter Jones <pjones@redhat.com>
@hroncok
Copy link
Contributor Author

hroncok commented Nov 19, 2018

This is as good as it gets.

Copy link
Member

@Conan-Kudo Conan-Kudo left a comment

Choose a reason for hiding this comment

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

LGTM

@Conan-Kudo Conan-Kudo merged commit 8c61700 into rpm-software-management:master Nov 19, 2018
@Conan-Kudo
Copy link
Member

@hroncok Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants