Merge ~arighi/qa-regression-testing:test-apparmor-support-python2-and-python3 into qa-regression-testing:master

[Andrea Righi]

[Francis Ginther (fginther)]

I recommend replacing this MP with https://code.launchpad.net/~fginther/qa-regression-testing/+git/qa-regression-testing/+merge/440800 which applies additional 2to3 updates.

[Steve Beattie (sbeattie)]

Thanks and my apologies for not getting to this earlier; the conversion of this script to python3 has already landed, so closing this merge request.

Unmerged commits

69f0cf2... by Andrea Righi on 2023-04-11

test-apparmor: support python2 and python3

Signed-off-by: Andrea Righi <email address hidden>

	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)
	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)
	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)

1 → 36 of 36 results

First • Previous • Next • Last

diff --git a/scripts/apparmor/test-net.py b/scripts/apparmor/test-net.py
index 6c3ae96..eb73d12 100755
--- a/scripts/apparmor/test-net.py
+++ b/scripts/apparmor/test-net.py
@@ -1,4 +1,7 @@
-#!/usr/bin/python2
+#!/bin/sh
+''':'
+if which python3 > /dev/null 2>&1; then exec python3 "$0" "$@"; else exec python2 "$0" "$@"; fi
+'''
 #
 #    test-net.py quality assurance test script for apparmor
 #    Copyright (C) 2011 Canonical Ltd.