pyOpenSSL 24.0.0 removed several APIs required by pccsadmin, so porting to pycryptography is required on Fedora. Since RHEL does not ship pyOpenSSL, the port is useful here too. Using pyasn1 instead of asn1 gives stronger validation during parsing and brings compatibility with RHEL that lacks python3-asn1 The keyring package needs to be optional on RHEL which lacks this module (currently). Also drop the inappropriate pccs port number change Related: https://issues.redhat.com/browse/RHEL-121612 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 64c49b04e7e22358f3afee834a434a6cfdff4a9b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Tue, 8 Oct 2024 10:13:02 +0100
|
|
Subject: [PATCH 110/126] pccsadmin: remove leftover debugging 'print(args)'
|
|
statement
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Dumping the python "Namespace" object to stdout after parsing argv
|
|
serves no user purpose. Remove what is presumably a leftover
|
|
debugging statement.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
tools/PccsAdminTool/pccsadmin.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/tools/PccsAdminTool/pccsadmin.py b/tools/PccsAdminTool/pccsadmin.py
|
|
index ffee326..8e447c5 100755
|
|
--- a/tools/PccsAdminTool/pccsadmin.py
|
|
+++ b/tools/PccsAdminTool/pccsadmin.py
|
|
@@ -92,7 +92,6 @@ def main():
|
|
parser.print_help()
|
|
parser.exit()
|
|
|
|
- print(args)
|
|
# Check mandatory arguments for appraisalpolicy
|
|
if args.command == 'put' and args.url and args.url.endswith("/appraisalpolicy"):
|
|
if not args.fmspc or not args.input_file:
|
|
--
|
|
2.51.1
|
|
|