This patches add compatibility for the forthcoming RobotFramework 5. Taken from: https://github.com/robotframework/SSHLibrary/pull/403. diff --git a/src/SSHLibrary/pythonforward.py b/src/SSHLibrary/pythonforward.py index 8b85997b7..607985cf4 100644 --- a/src/SSHLibrary/pythonforward.py +++ b/src/SSHLibrary/pythonforward.py @@ -1,9 +1,9 @@ import select import socket import threading -from robot.utils import platform +from robot.utils import PY2, WINDOWS from .logger import logger -if platform.PY2 and platform.WINDOWS: +if PY2 and WINDOWS: import win_inet_pton try: import SocketServer lue='32792d2073f3096cb0710c40a7c74e5797ef0e6e'/> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/system/examples/plasma.tmpl
AgeCommit message (Expand)Author
2023-08-22examples: Avoid duplicate SDDM service for Plasma on aarch64-linux....This is a followup to cf28f46930f1ea4087d84c162cfacfcdff842b1f. * gnu/system/examples/plasma.tmpl (services): Remove both 'gdm-service-type' and 'sddm-service-type' from %DESKTOP-SERVICES. Ludovic Courtès
2023-08-21examples: Avoid 'modify-services' to remove GDM....This led to a 'tests/guix-system.sh' failure on aarch64-linux: …/plasma.tmpl:60:13: error: modify-services: service 'gdm' not found in service list This is because 'gdm-service-type' is not among %DESKTOP-SERVICES on that architecture. * gnu/system/examples/plasma.tmpl (services): Use 'remove' rather 'modify-services' + 'delete'. Ludovic Courtès
2023-08-03examples: Add plasma operating-system example template....* gnu/system/examples/plasma.tmpl: New file. * Makefile.am (EXAMPLES): register it. Signed-off-by: 宋文武 <iyzsong@member.fsf.org> Zheng Junjie