From a381e2b5fd4177dc9a9391c2e90212f1ebd1fdd2 Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Sun, 21 Aug 2016 18:20:05 -0300 Subject: build-sys: explicitly require python3 Otherwise python programs might be run with python2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5979de4dc6..32febcabe9 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,7 @@ AC_ARG_WITH([python], have_lxml=no AS_IF([test "x$with_python" != "xno"], [ - AM_PATH_PYTHON(,, [:]) + AM_PATH_PYTHON([3],, [:]) AS_IF([test "x$PYTHON" != "x:"], [ AC_MSG_CHECKING([for python lxml module]) AS_IF(["$PYTHON" -c 'import lxml' 2>/dev/null], [have_lxml=yes]) -- cgit v1.2.3-54-g00ecf From b95f5528cc7e84327966308ea8e29d5920048cda Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Sun, 21 Aug 2016 20:25:37 -0300 Subject: Use python3 explicitly in all python scripts --- src/journal-remote/log-generator.py | 3 +-- test/rule-syntax-check.py | 1 + test/sysv-generator-test.py | 2 +- tools/gdb-sd_dump_hashmaps.py | 1 + tools/make-directive-index.py | 1 + tools/make-man-index.py | 1 + tools/make-man-rules.py | 1 + tools/xml_helper.py | 1 + 8 files changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 test/rule-syntax-check.py diff --git a/src/journal-remote/log-generator.py b/src/journal-remote/log-generator.py index fd6964e758..24874e960c 100755 --- a/src/journal-remote/log-generator.py +++ b/src/journal-remote/log-generator.py @@ -1,5 +1,4 @@ -#!/usr/bin/python -from __future__ import print_function +#!/usr/bin/python3 import sys import argparse diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py old mode 100644 new mode 100755 index e43a3daeb3..e4185cb0fa --- a/test/rule-syntax-check.py +++ b/test/rule-syntax-check.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # Simple udev rules syntax checker # # (C) 2010 Canonical Ltd. diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 838dd57a6f..50175485f7 100755 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # systemd-sysv-generator integration test # diff --git a/tools/gdb-sd_dump_hashmaps.py b/tools/gdb-sd_dump_hashmaps.py index 9ee81fb05a..d20016e005 100644 --- a/tools/gdb-sd_dump_hashmaps.py +++ b/tools/gdb-sd_dump_hashmaps.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py index 256ff3dc5d..8ce09ca2fa 100755 --- a/tools/make-directive-index.py +++ b/tools/make-directive-index.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-man-index.py b/tools/make-man-index.py index 74a47b821a..50ad9532cd 100755 --- a/tools/make-man-index.py +++ b/tools/make-man-index.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py index 5e61917d60..18aa513952 100644 --- a/tools/make-man-rules.py +++ b/tools/make-man-rules.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/xml_helper.py b/tools/xml_helper.py index e87126f2f7..b2c036909d 100644 --- a/tools/xml_helper.py +++ b/tools/xml_helper.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. -- cgit v1.2.3-54-g00ecf