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

Add more pre-commit hooks #1211

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-ast
- id: check-executables-have-shebangs
- id: check-shebang-scripts-are-executable
- id: check-merge-conflict
- id: end-of-file-fixer
exclude: (lib/portage/tests/.gnupg/private-keys-v1.d/.*\.key)
- id: mixed-line-ending
exclude: (lib/portage/tests/.gnupg/private-keys-v1.d/.*\.key)
- id: trailing-whitespace
exclude: (cnf/make\.conf\.example\..*\.diff)
- repo: https://github.com/psf/black
rev: 24.1.1
hooks:
Expand Down
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
Expand All @@ -21,7 +21,7 @@ License: BSD-3-clause
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Expand Down
1 change: 0 additions & 1 deletion RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -1982,4 +1982,3 @@ portage-2.1
in make.conf. Interested in figuring out what use flags were turned off? Check out
/usr/portage/profiles/base/use.defaults and other use.defaults files that correspond
to your profile.

Empty file modified bin/bashrc-functions.sh
100644 → 100755
Empty file.
Empty file modified bin/doins.py
100644 → 100755
Empty file.
Empty file modified bin/eapi.sh
100644 → 100755
Empty file.
Empty file modified bin/eapi7-ver-funcs.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion bin/ebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export PORTAGE_BZIP2_COMMAND=${PORTAGE_BZIP2_COMMAND:-bzip2}

# These two functions wrap sourcing and calling respectively. At present they
# perform a qa check to make sure eclasses and ebuilds and profiles don't mess
# with shell opts (shopts). Ebuilds/eclasses changing shopts should reset them
# with shell opts (shopts). Ebuilds/eclasses changing shopts should reset them
# when they are done.

__qa_source() {
Expand Down
Empty file modified bin/helper-functions.sh
100644 → 100755
Empty file.
Empty file modified bin/isolated-functions.sh
100644 → 100755
Empty file.
Empty file modified bin/phase-functions.sh
100644 → 100755
Empty file.
Empty file modified bin/phase-helpers.sh
100644 → 100755
Empty file.
Empty file modified bin/pid-ns-init
100644 → 100755
Empty file.
Empty file modified bin/save-ebuild-env.sh
100644 → 100755
Empty file.
Empty file modified bin/socks5-server.py
100644 → 100755
Empty file.
Empty file modified cnf/repo.postsync.d/example
100644 → 100755
Empty file.
10 changes: 5 additions & 5 deletions cnf/sets/portage.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# WARNING: default set configuration, DO NOT CHANGE.
# If you want to change anything redefine the relevant section in
# /etc/portage/sets.conf. Any changes to this file will be lost on the next
# portage update, and configuration errors here might upset portage in
# If you want to change anything redefine the relevant section in
# /etc/portage/sets.conf. Any changes to this file will be lost on the next
# portage update, and configuration errors here might upset portage in
# unexpected ways.

# Not much that could be changed for world, so better leave it alone
Expand All @@ -25,10 +25,10 @@ class = portage.sets.files.WorldSelectedSetsSet
[system]
class = portage.sets.profiles.PackagesSystemSet

# For security there are multiple classes available, but differences are
# For security there are multiple classes available, but differences are
# rather small (normally there should be no visible difference):
# - AffectedSet: include all GLSAs that cover a vulnerable package
# - NewAffectedSet: include all GLSAs that cover a vulnerable package and
# - NewAffectedSet: include all GLSAs that cover a vulnerable package and
# haven't been applied previously
# - NewGlsaSet: include all GLSAs that haven't been applied
# - SecuritySet: include all GLSAs
Expand Down
2 changes: 1 addition & 1 deletion doc/config/bashrc.docbook
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
If one or more bashrc files exist in the following locations, they will
be sourced before the ebuild is executed in the following order:
</para>

<orderedlist>
<listitem><para><filename>/etc/portage/bashrc</filename></para></listitem>
<listitem><para><filename>/etc/portage/env/${CATEGORY}/${PN}</filename></para></listitem>
Expand Down
Loading
Loading