[virt-tools-list] [virt-manager PATCH 2/3] Use proper python version

Martin Kletzander mkletzan at redhat.com
Wed Feb 12 16:52:55 UTC 2014


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 <mkletzan at redhat.com>
---
 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 055e218..388bdf8 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 3641b1d..741fae8 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 6ea1f99..1facd0b 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 f40aceb..c005193 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 <jboggs at redhat.com>
diff --git a/virt-image b/virt-image
index 871f228..60e38ae 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 <dlutter at redhat.com>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/virt-install b/virt-install
index 9121445..6453f77 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 27026ac..47461fa 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 <berrange at redhat.com>
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/virt-xml b/virt-xml
index dc0093a..bac6964 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 <crobinso at redhat.com>
-- 
1.8.5.4




More information about the virt-tools-list mailing list