From 4196f4287be2c7020bb9925837a02f47d47e6ada Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Wed, 12 Feb 2014 10:21:38 +0100 Subject: [PATCH] Use proper python version since we work with python2 only, mentioning it in all shebangs make the commands from git work even when python3 is set as default. This also fixes one test where command being ran is 'virt-xml' through subprocess.Popen(). While at that, add '-tt' where possible in order to make everyone use same indentation characters. Signed-off-by: Martin Kletzander --- setup.py | 2 +- tests/test_inject.py | 2 +- virt-clone | 2 +- virt-convert | 2 +- virt-image | 4 ++-- virt-install | 4 ++-- virt-manager | 5 ++--- virt-xml | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py index 055e2187..388bdf8f 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (C) 2013, 2014 Red Hat, Inc. # pylint: disable=W0201 diff --git a/tests/test_inject.py b/tests/test_inject.py index 3641b1dc..741fae8c 100755 --- a/tests/test_inject.py +++ b/tests/test_inject.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 -tt # Copyright (C) 2013, 2014 Red Hat, Inc. import atexit diff --git a/virt-clone b/virt-clone index 6ea1f991..1facd0bf 100755 --- a/virt-clone +++ b/virt-clone @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python2 -tt # # Copyright(c) FUJITSU Limited 2007. # diff --git a/virt-convert b/virt-convert index f40aceb2..c005193b 100755 --- a/virt-convert +++ b/virt-convert @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 -tt # # Copyright 2008, 2013, 2014 Red Hat, Inc. # Joey Boggs diff --git a/virt-image b/virt-image index 871f2284..60e38aed 100755 --- a/virt-image +++ b/virt-image @@ -1,8 +1,8 @@ -#!/usr/bin/python -tt +#!/usr/bin/python2 -tt # # Create a virtual machine from an XML image description # -# Copyright 2007 Red Hat, Inc. +# Copyright 2007, 2014 Red Hat, Inc. # David Lutterkort # # This program is free software; you can redistribute it and/or modify diff --git a/virt-install b/virt-install index 91214457..6453f775 100755 --- a/virt-install +++ b/virt-install @@ -1,6 +1,6 @@ -#!/usr/bin/python -tt +#!/usr/bin/python2 -tt # -# Copyright 2005-2013 Red Hat, Inc. +# Copyright 2005-2014 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/virt-manager b/virt-manager index 27026ac1..47461fa5 100755 --- a/virt-manager +++ b/virt-manager @@ -1,7 +1,6 @@ -#!/usr/bin/python - +#!/usr/bin/python2 -tt # -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2006, 2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # # This program is free software; you can redistribute it and/or modify diff --git a/virt-xml b/virt-xml index 0f83dc51..4e0848ce 100755 --- a/virt-xml +++ b/virt-xml @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python2 -tt # # Copyright 2013-2014 Red Hat, Inc. # Cole Robinson