From 2c2e5829627b70c9be06e7b79263bdc00818ea2c Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 14 Sep 2023 10:22:31 +1000 Subject: [PATCH] pmdahaproxy: fix connect script handling of string quoting From qa/1110 on rawhide > $PCP_VAR_DIR/pmdas/haproxy/connect:60: SyntaxWarning: invalid escape sequence '\&' Python 3.12 is producing errors on invalid escape sequences embedded in strings on rawhide - use double-backslash which seems to be the original intention here. --- src/pmdas/haproxy/connect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pmdas/haproxy/connect b/src/pmdas/haproxy/connect index e491eb9477..c747e29bf5 100755 --- a/src/pmdas/haproxy/connect +++ b/src/pmdas/haproxy/connect @@ -57,7 +57,7 @@ if config.has_section('pmda'): sys.exit(1) if len(sys.argv) > 1 and (sys.argv[1] == '-c' or sys.argv[1] == '--config'): - sys.stdout.write("user=%s\nsocket=%s\nurl=%s\n" % (user, skt, url.replace(";", "\;").replace("&", "\&"))) + sys.stdout.write("user=%s\nsocket=%s\nurl=%s\n" % (user, skt, url.replace(";", "\\;").replace("&", "\\&"))) sys.exit(0) try: