diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-apps/pkgcore/files | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'sys-apps/pkgcore/files')
-rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch | 24 | ||||
-rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch | 47 |
2 files changed, 47 insertions, 24 deletions
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch deleted file mode 100644 index f2e4ab15a830..000000000000 --- a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 780bf8e6a2b83a244461304017ab036bcf8c6eb9 Mon Sep 17 00:00:00 2001 -From: Tim Harder <radhermit@gmail.com> -Date: Thu, 5 Nov 2020 07:20:18 -0700 -Subject: [PATCH] data/xml-schema: update metadata.xsd - ---- - data/xml-schema/metadata.xsd | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd -index 8b8ac0b5..db243abb 100644 ---- a/data/xml-schema/metadata.xsd -+++ b/data/xml-schema/metadata.xsd -@@ -272,6 +272,7 @@ - <xs:enumeration value='gitlab'/> - <xs:enumeration value='gitorious'/> - <xs:enumeration value='google-code'/> -+ <xs:enumeration value='heptapod'/> - <xs:enumeration value='launchpad'/> - <xs:enumeration value='pear'/> - <xs:enumeration value='pecl'/> --- -2.29.2 - diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch new file mode 100644 index 000000000000..30cec9114f56 --- /dev/null +++ b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch @@ -0,0 +1,47 @@ +From 533f1edd70054a5479ee85719d3cbef0d15627fd Mon Sep 17 00:00:00 2001 +From: Tim Harder <radhermit@gmail.com> +Date: Sun, 28 Mar 2021 17:18:16 -0600 +Subject: [PATCH] ebuild.processor: register SIGINT and SIGTERM signal handlers + on ebd init + +Rather than at a global, module level to avoid issues with inadvertent +issues during 3rd party imports, e.g. the pkgcore pytest plugin getting +autoloaded by some other project's testsuite. +--- + src/pkgcore/ebuild/processor.py | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/pkgcore/ebuild/processor.py b/src/pkgcore/ebuild/processor.py +index e8c3c2cd4..65437efcf 100644 +--- a/src/pkgcore/ebuild/processor.py ++++ b/src/pkgcore/ebuild/processor.py +@@ -275,9 +275,6 @@ def chuck_KeyboardInterrupt(*args): + raise KeyboardInterrupt("ctrl+c encountered") + + +-signal.signal(signal.SIGINT, chuck_KeyboardInterrupt) +- +- + def chuck_TermInterrupt(ebp, *args): + """Event handler for SIGTERM.""" + if ebp is None: +@@ -292,9 +289,6 @@ def chuck_TermInterrupt(ebp, *args): + ebp.shutdown_processor() + + +-signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None)) +- +- + def chuck_UnhandledCommand(ebp, line): + """Event handler for unhandled commands.""" + raise UnhandledCommand(line) +@@ -332,6 +326,9 @@ def __init__(self, userpriv, sandbox, fd_pipes=None): + self._outstanding_expects = [] + self._metadata_paths = None + ++ signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None)) ++ signal.signal(signal.SIGINT, chuck_KeyboardInterrupt) ++ + if userpriv: + self.__userpriv = True + spawn_opts.update({ |