summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/__init__.py4
-rw-r--r--tests/capabilities.py4
-rw-r--r--tests/clitest.py4
-rw-r--r--tests/clonetest.py4
-rw-r--r--tests/image.py4
-rw-r--r--tests/interface.py4
-rw-r--r--tests/misc.py4
-rw-r--r--tests/nodedev.py4
-rw-r--r--tests/storage.py4
-rw-r--r--tests/support.py4
-rw-r--r--tests/test_urls.py4
-rw-r--r--tests/utils.py4
-rw-r--r--tests/virtconvtest.py4
-rw-r--r--tests/xmlconfig.py4
-rw-r--r--tests/xmlparse.py4
-rw-r--r--virtconv/__init__.py4
-rw-r--r--virtconv/diskcfg.py4
-rw-r--r--virtconv/formats.py4
-rw-r--r--virtconv/netdevcfg.py4
-rw-r--r--virtconv/parsers/ovf.py4
-rw-r--r--virtconv/parsers/virtimage.py4
-rw-r--r--virtconv/parsers/vmx.py4
-rw-r--r--virtconv/vmcfg.py4
-rw-r--r--virtinst/__init__.py4
-rw-r--r--virtinst/capabilities.py4
-rw-r--r--virtinst/cli.py6
-rw-r--r--virtinst/clock.py4
-rw-r--r--virtinst/cloner.py6
-rw-r--r--virtinst/connection.py6
-rw-r--r--virtinst/cpu.py4
-rw-r--r--virtinst/device.py6
-rw-r--r--virtinst/deviceaudio.py4
-rw-r--r--virtinst/devicechar.py4
-rw-r--r--virtinst/devicecontroller.py4
-rw-r--r--virtinst/devicedisk.py6
-rw-r--r--virtinst/devicefilesystem.py4
-rw-r--r--virtinst/devicegraphics.py4
-rw-r--r--virtinst/devicehostdev.py4
-rw-r--r--virtinst/deviceinput.py4
-rw-r--r--virtinst/deviceinterface.py4
-rw-r--r--virtinst/devicememballoon.py6
-rw-r--r--virtinst/deviceredirdev.py4
-rw-r--r--virtinst/devicerng.py6
-rw-r--r--virtinst/devicesmartcard.py4
-rw-r--r--virtinst/devicetpm.py6
-rw-r--r--virtinst/devicevideo.py4
-rw-r--r--virtinst/devicewatchdog.py4
-rw-r--r--virtinst/diskbackend.py6
-rw-r--r--virtinst/distroinstaller.py4
-rw-r--r--virtinst/domainfeatures.py4
-rw-r--r--virtinst/domainnumatune.py4
-rw-r--r--virtinst/guest.py6
-rw-r--r--virtinst/hostkeymap.py4
-rw-r--r--virtinst/installer.py4
-rw-r--r--virtinst/interface.py4
-rw-r--r--virtinst/network.py4
-rw-r--r--virtinst/nodedev.py4
-rw-r--r--virtinst/osdict.py4
-rw-r--r--virtinst/osxml.py4
-rw-r--r--virtinst/seclabel.py4
-rw-r--r--virtinst/snapshot.py4
-rw-r--r--virtinst/storage.py4
-rw-r--r--virtinst/support.py4
-rw-r--r--virtinst/urlfetcher.py8
-rw-r--r--virtinst/util.py6
-rw-r--r--virtinst/virtimage.py6
-rw-r--r--virtinst/xmlbuilder.py6
67 files changed, 149 insertions, 149 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index c1828226..ea3c8c3c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/capabilities.py b/tests/capabilities.py
index 859b126d..271ae9c8 100644
--- a/tests/capabilities.py
+++ b/tests/capabilities.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/clitest.py b/tests/clitest.py
index 33c9e508..ea24d49c 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/clonetest.py b/tests/clonetest.py
index 606f0234..2ef583ed 100644
--- a/tests/clonetest.py
+++ b/tests/clonetest.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/image.py b/tests/image.py
index e6ea6b8b..6c2fadbe 100644
--- a/tests/image.py
+++ b/tests/image.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/interface.py b/tests/interface.py
index dffabf68..dbc305cc 100644
--- a/tests/interface.py
+++ b/tests/interface.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/misc.py b/tests/misc.py
index 282018e0..c164d250 100644
--- a/tests/misc.py
+++ b/tests/misc.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/nodedev.py b/tests/nodedev.py
index 12688885..f93a6cfe 100644
--- a/tests/nodedev.py
+++ b/tests/nodedev.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/storage.py b/tests/storage.py
index 19875a33..6c9fbdd8 100644
--- a/tests/storage.py
+++ b/tests/storage.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/support.py b/tests/support.py
index 3f38ed99..5385db5e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/test_urls.py b/tests/test_urls.py
index 76e8c20a..cea20b79 100644
--- a/tests/test_urls.py
+++ b/tests/test_urls.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/utils.py b/tests/utils.py
index c388aba6..c13a9978 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/virtconvtest.py b/tests/virtconvtest.py
index 5cc5d7b5..f286b780 100644
--- a/tests/virtconvtest.py
+++ b/tests/virtconvtest.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py
index 368896b5..2677b082 100644
--- a/tests/xmlconfig.py
+++ b/tests/xmlconfig.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 01be6bc2..7b5c793b 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/__init__.py b/virtconv/__init__.py
index c2f5d240..5cdca2b8 100644
--- a/virtconv/__init__.py
+++ b/virtconv/__init__.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/diskcfg.py b/virtconv/diskcfg.py
index f1bc1a46..103f6cc5 100644
--- a/virtconv/diskcfg.py
+++ b/virtconv/diskcfg.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/formats.py b/virtconv/formats.py
index 433096e8..36d7c50f 100644
--- a/virtconv/formats.py
+++ b/virtconv/formats.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/netdevcfg.py b/virtconv/netdevcfg.py
index 031e7b6b..94f19b15 100644
--- a/virtconv/netdevcfg.py
+++ b/virtconv/netdevcfg.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/parsers/ovf.py b/virtconv/parsers/ovf.py
index e30b9397..c8311773 100644
--- a/virtconv/parsers/ovf.py
+++ b/virtconv/parsers/ovf.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/parsers/virtimage.py b/virtconv/parsers/virtimage.py
index 77f42cc0..ada40c47 100644
--- a/virtconv/parsers/virtimage.py
+++ b/virtconv/parsers/virtimage.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/parsers/vmx.py b/virtconv/parsers/vmx.py
index 634ccceb..afbf28a9 100644
--- a/virtconv/parsers/vmx.py
+++ b/virtconv/parsers/vmx.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtconv/vmcfg.py b/virtconv/vmcfg.py
index 8806d4d6..65760dc0 100644
--- a/virtconv/vmcfg.py
+++ b/virtconv/vmcfg.py
@@ -5,8 +5,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/__init__.py b/virtinst/__init__.py
index 3769de10..71651fe6 100644
--- a/virtinst/__init__.py
+++ b/virtinst/__init__.py
@@ -2,8 +2,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
index deac8692..b2b29527 100644
--- a/virtinst/capabilities.py
+++ b/virtinst/capabilities.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/cli.py b/virtinst/cli.py
index f8cedda0..c5f9fa62 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -1,13 +1,13 @@
#
# Utility functions for the command line drivers
#
-# Copyright 2006-2007, 2013 Red Hat, Inc.
+# Copyright 2006-2007, 2013 Red Hat, Inc.
# Jeremy Katz <katzj@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/clock.py b/virtinst/clock.py
index 8fc672da..cabef7c3 100644
--- a/virtinst/clock.py
+++ b/virtinst/clock.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/cloner.py b/virtinst/cloner.py
index 93e82a80..eafe0c72 100644
--- a/virtinst/cloner.py
+++ b/virtinst/cloner.py
@@ -1,13 +1,13 @@
#
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Copyright(c) FUJITSU Limited 2007.
#
# Cloning a virtual machine module.
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/connection.py b/virtinst/connection.py
index ab254866..70bb6031 100644
--- a/virtinst/connection.py
+++ b/virtinst/connection.py
@@ -1,10 +1,10 @@
#
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/cpu.py b/virtinst/cpu.py
index b50c8df0..4318b56e 100644
--- a/virtinst/cpu.py
+++ b/virtinst/cpu.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/device.py b/virtinst/device.py
index e193e062..43408d63 100644
--- a/virtinst/device.py
+++ b/virtinst/device.py
@@ -1,13 +1,13 @@
#
# Base class for all VM devices
#
-# Copyright 2008, 2013 Red Hat, Inc.
+# Copyright 2008, 2013 Red Hat, Inc.
# Cole Robinson <crobinso@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/deviceaudio.py b/virtinst/deviceaudio.py
index 26fa6c45..2b1e1eb1 100644
--- a/virtinst/deviceaudio.py
+++ b/virtinst/deviceaudio.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicechar.py b/virtinst/devicechar.py
index 0132de4b..4212af52 100644
--- a/virtinst/devicechar.py
+++ b/virtinst/devicechar.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicecontroller.py b/virtinst/devicecontroller.py
index 5643bc30..9da44bf5 100644
--- a/virtinst/devicecontroller.py
+++ b/virtinst/devicecontroller.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicedisk.py b/virtinst/devicedisk.py
index b9b0857b..76f505bc 100644
--- a/virtinst/devicedisk.py
+++ b/virtinst/devicedisk.py
@@ -1,13 +1,13 @@
#
# Classes for building disk device xml
#
-# Copyright 2006-2008, 2012-2013 Red Hat, Inc.
+# Copyright 2006-2008, 2012-2013 Red Hat, Inc.
# Jeremy Katz <katzj@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicefilesystem.py b/virtinst/devicefilesystem.py
index c24366e6..ec5ecfe0 100644
--- a/virtinst/devicefilesystem.py
+++ b/virtinst/devicefilesystem.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicegraphics.py b/virtinst/devicegraphics.py
index abc6d296..0ae1049b 100644
--- a/virtinst/devicegraphics.py
+++ b/virtinst/devicegraphics.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicehostdev.py b/virtinst/devicehostdev.py
index bf1ef78a..8fd471dc 100644
--- a/virtinst/devicehostdev.py
+++ b/virtinst/devicehostdev.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/deviceinput.py b/virtinst/deviceinput.py
index d96bab7f..a34f0986 100644
--- a/virtinst/deviceinput.py
+++ b/virtinst/deviceinput.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/deviceinterface.py b/virtinst/deviceinterface.py
index 6bf7359b..ed1bd723 100644
--- a/virtinst/deviceinterface.py
+++ b/virtinst/deviceinterface.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicememballoon.py b/virtinst/devicememballoon.py
index cf5490dc..856e0215 100644
--- a/virtinst/devicememballoon.py
+++ b/virtinst/devicememballoon.py
@@ -1,12 +1,12 @@
# Copyright (C) 2013 Red Hat, Inc.
#
# Copyright 2012
-# Eiichi Tsukata <devel@etsukata.com>
+# Eiichi Tsukata <devel@etsukata.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/deviceredirdev.py b/virtinst/deviceredirdev.py
index f939f316..28375850 100644
--- a/virtinst/deviceredirdev.py
+++ b/virtinst/deviceredirdev.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicerng.py b/virtinst/devicerng.py
index c28dde0d..71fdbd37 100644
--- a/virtinst/devicerng.py
+++ b/virtinst/devicerng.py
@@ -1,12 +1,12 @@
# coding=utf-8
#
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
# Giuseppe Scrivano <gscrivan@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicesmartcard.py b/virtinst/devicesmartcard.py
index b1d0229d..635ad6de 100644
--- a/virtinst/devicesmartcard.py
+++ b/virtinst/devicesmartcard.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicetpm.py b/virtinst/devicetpm.py
index 3ab2b9ae..fa990112 100644
--- a/virtinst/devicetpm.py
+++ b/virtinst/devicetpm.py
@@ -4,13 +4,13 @@
# Cole Robinson <crobinso@redhat.com>
# Marc-André Lureau <marcandre.lureau@redhat.com>
#
-# Copyright 2013 IBM Corporation
+# Copyright 2013 IBM Corporation
# Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicevideo.py b/virtinst/devicevideo.py
index 1552a227..922f07c7 100644
--- a/virtinst/devicevideo.py
+++ b/virtinst/devicevideo.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/devicewatchdog.py b/virtinst/devicewatchdog.py
index 1db472f5..93ec8f24 100644
--- a/virtinst/devicewatchdog.py
+++ b/virtinst/devicewatchdog.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py
index bf78c398..56920046 100644
--- a/virtinst/diskbackend.py
+++ b/virtinst/diskbackend.py
@@ -1,12 +1,12 @@
#
# Storage lookup/creation helpers
#
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py
index c9db7dde..7acabd1c 100644
--- a/virtinst/distroinstaller.py
+++ b/virtinst/distroinstaller.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/domainfeatures.py b/virtinst/domainfeatures.py
index 48ed70b0..71d5922e 100644
--- a/virtinst/domainfeatures.py
+++ b/virtinst/domainfeatures.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/domainnumatune.py b/virtinst/domainnumatune.py
index 7652ee59..86b46907 100644
--- a/virtinst/domainnumatune.py
+++ b/virtinst/domainnumatune.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/guest.py b/virtinst/guest.py
index d3a27c77..dc165ea5 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -1,13 +1,13 @@
#
# Common code for all guests
#
-# Copyright 2006-2009, 2013 Red Hat, Inc.
+# Copyright 2006-2009, 2013 Red Hat, Inc.
# Jeremy Katz <katzj@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/hostkeymap.py b/virtinst/hostkeymap.py
index 38694d9b..904333e9 100644
--- a/virtinst/hostkeymap.py
+++ b/virtinst/hostkeymap.py
@@ -3,8 +3,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/installer.py b/virtinst/installer.py
index efe72552..375670c2 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/interface.py b/virtinst/interface.py
index 853c07c5..c1e0c88d 100644
--- a/virtinst/interface.py
+++ b/virtinst/interface.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/network.py b/virtinst/network.py
index 502c1cec..8925dc33 100644
--- a/virtinst/network.py
+++ b/virtinst/network.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py
index e0d85fbb..a0a9d9ce 100644
--- a/virtinst/nodedev.py
+++ b/virtinst/nodedev.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/osdict.py b/virtinst/osdict.py
index 9a0fc2e2..819698b2 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/osxml.py b/virtinst/osxml.py
index 7b6a894d..473fd126 100644
--- a/virtinst/osxml.py
+++ b/virtinst/osxml.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/seclabel.py b/virtinst/seclabel.py
index 7aa525a5..76afb1d8 100644
--- a/virtinst/seclabel.py
+++ b/virtinst/seclabel.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/snapshot.py b/virtinst/snapshot.py
index 44d8588d..91d72375 100644
--- a/virtinst/snapshot.py
+++ b/virtinst/snapshot.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/storage.py b/virtinst/storage.py
index 0623fae1..4b6e5817 100644
--- a/virtinst/storage.py
+++ b/virtinst/storage.py
@@ -4,8 +4,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/support.py b/virtinst/support.py
index ac6ecd9f..415eb456 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -6,8 +6,8 @@
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
index a60abdad..a31d7de9 100644
--- a/virtinst/urlfetcher.py
+++ b/virtinst/urlfetcher.py
@@ -1,13 +1,13 @@
#
# Represents OS distribution specific install data
#
-# Copyright 2006-2007, 2013 Red Hat, Inc.
+# Copyright 2006-2007, 2013 Red Hat, Inc.
# Daniel P. Berrange <berrange@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -765,7 +765,7 @@ class SLDistro(RHELDistro):
return self.fetcher.hasFile("SL")
-# Suse image store is harder - we fetch the kernel RPM and a helper
+# Suse image store is harder - we fetch the kernel RPM and a helper
# RPM and then munge bits together to generate a initrd
class SuseDistro(Distro):
name = "SUSE"
diff --git a/virtinst/util.py b/virtinst/util.py
index c32038d4..f79192e7 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -1,11 +1,11 @@
#
-# Copyright 2006, 2013 Red Hat, Inc.
+# Copyright 2006, 2013 Red Hat, Inc.
# Jeremy Katz <katzj@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/virtimage.py b/virtinst/virtimage.py
index 38c04def..f85e8e91 100644
--- a/virtinst/virtimage.py
+++ b/virtinst/virtimage.py
@@ -1,13 +1,13 @@
# Sample code to parse an image XML description and
# spit out libvirt XML
#
-# Copyright 2007, 2013 Red Hat, Inc.
+# Copyright 2007, 2013 Red Hat, Inc.
# David Lutterkort <dlutter@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py
index e56c2252..86cd78ce 100644
--- a/virtinst/xmlbuilder.py
+++ b/virtinst/xmlbuilder.py
@@ -1,13 +1,13 @@
#
# Base class for all VM devices
#
-# Copyright 2008, 2013 Red Hat, Inc.
+# Copyright 2008, 2013 Red Hat, Inc.
# Cole Robinson <crobinso@redhat.com>
#
# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of