This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new eac2bbe Patch gnupg to debug gpg errors
eac2bbe is described below
commit eac2bbe68dbf63d10c6c6588b46dd5de9c2b5208
Author: Sean B. Palmer <[email protected]>
AuthorDate: Wed Jun 18 19:21:07 2025 +0100
Patch gnupg to debug gpg errors
---
Dockerfile.alpine | 4 ++++
patches/gnupg.py.patch | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 0f4fbab..e2052a3 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -49,6 +49,7 @@ RUN apk update && \
make \
nix \
openjdk8 \
+ patch \
rsync \
subversion
@@ -58,11 +59,14 @@ WORKDIR /opt/atr
COPY --from=builder /opt/atr/.venv ./.venv
COPY --from=builder /opt/atr/atr ./atr
COPY --from=builder /opt/atr/migrations ./migrations
+COPY --from=builder /opt/atr/patches ./patches
COPY --from=builder /opt/atr/scripts ./scripts
COPY --from=builder /opt/atr/Makefile .
COPY --from=builder /opt/atr/alembic.ini .
COPY --from=builder /opt/atr/start-atr.sh .
+RUN patch /opt/atr/.venv/lib/python3.13/site-packages/gnupg.py
/opt/atr/patches/gnupg.py.patch
+
RUN chmod +x ./start-atr.sh
# install additional tools
diff --git a/patches/gnupg.py.patch b/patches/gnupg.py.patch
new file mode 100644
index 0000000..7bac984
--- /dev/null
+++ b/patches/gnupg.py.patch
@@ -0,0 +1,14 @@
+--- a/gnupg.py 2025-06-18 19:11:47
++++ b/gnupg.py 2025-06-18 19:11:18
+@@ -1307,6 +1307,11 @@
+ process.wait()
+ result.returncode = rc = process.returncode
+ if rc != 0:
++ logger.warning('result: %r', result)
++ if hasattr(result, 'data'):
++ logger.warning('stdout: %r', result.data)
++ if hasattr(result, 'stderr'):
++ logger.warning('stderr: %r', result.stderr)
+ logger.warning('gpg returned a non-zero error code: %d', rc)
+ if stdin is not None:
+ try:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
