Updated by this script:
find -name '*.py' -exec sed -i "s|^\(#.*[^.?\!]\) \(.*[^#]\)$|\1 \2|g" \{\} \;
Signed-off-by: Giuseppe Scrivano <gscrivan@xxxxxxxxxx>
---
tests/__init__.py | 4 ++--
tests/capabilities.py | 4 ++--
tests/clitest.py | 4 ++--
tests/clonetest.py | 4 ++--
tests/image.py | 4 ++--
tests/interface.py | 4 ++--
tests/misc.py | 4 ++--
tests/nodedev.py | 4 ++--
tests/storage.py | 4 ++--
tests/support.py | 4 ++--
tests/test_urls.py | 4 ++--
tests/utils.py | 4 ++--
tests/virtconvtest.py | 4 ++--
tests/xmlconfig.py | 4 ++--
tests/xmlparse.py | 4 ++--
virtconv/__init__.py | 4 ++--
virtconv/diskcfg.py | 4 ++--
virtconv/formats.py | 4 ++--
virtconv/netdevcfg.py | 4 ++--
virtconv/parsers/ovf.py | 4 ++--
virtconv/parsers/virtimage.py | 4 ++--
virtconv/parsers/vmx.py | 4 ++--
virtconv/vmcfg.py | 4 ++--
virtinst/__init__.py | 4 ++--
virtinst/capabilities.py | 4 ++--
virtinst/cli.py | 6 +++---
virtinst/clock.py | 4 ++--
virtinst/cloner.py | 6 +++---
virtinst/connection.py | 6 +++---
virtinst/cpu.py | 4 ++--
virtinst/device.py | 6 +++---
virtinst/deviceaudio.py | 4 ++--
virtinst/devicechar.py | 4 ++--
virtinst/devicecontroller.py | 4 ++--
virtinst/devicedisk.py | 6 +++---
virtinst/devicefilesystem.py | 4 ++--
virtinst/devicegraphics.py | 4 ++--
virtinst/devicehostdev.py | 4 ++--
virtinst/deviceinput.py | 4 ++--
virtinst/deviceinterface.py | 4 ++--
virtinst/devicememballoon.py | 6 +++---
virtinst/deviceredirdev.py | 4 ++--
virtinst/devicerng.py | 6 +++---
virtinst/devicesmartcard.py | 4 ++--
virtinst/devicetpm.py | 6 +++---
virtinst/devicevideo.py | 4 ++--
virtinst/devicewatchdog.py | 4 ++--
virtinst/diskbackend.py | 6 +++---
virtinst/distroinstaller.py | 4 ++--
virtinst/domainfeatures.py | 4 ++--
virtinst/domainnumatune.py | 4 ++--
virtinst/guest.py | 6 +++---
virtinst/hostkeymap.py | 4 ++--
virtinst/installer.py | 4 ++--
virtinst/interface.py | 4 ++--
virtinst/network.py | 4 ++--
virtinst/nodedev.py | 4 ++--
virtinst/osdict.py | 4 ++--
virtinst/osxml.py | 4 ++--
virtinst/seclabel.py | 4 ++--
virtinst/snapshot.py | 4 ++--
virtinst/storage.py | 4 ++--
virtinst/support.py | 4 ++--
virtinst/urlfetcher.py | 8 ++++----
virtinst/util.py | 6 +++---
virtinst/virtimage.py | 6 +++---
virtinst/xmlbuilder.py | 6 +++---
67 files changed, 149 insertions(+), 149 deletions(-)
diff --git a/tests/__init__.py b/tests/__init__.py
index c182822..ea3c8c3 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 859b126..271ae9c 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 33c9e50..ea24d49 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 606f023..2ef583e 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 e6ea6b8..6c2fadb 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 dffabf6..dbc305c 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 282018e..c164d25 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 1268888..f93a6cf 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 19875a3..6c9fbdd 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 3f38ed9..5385db5 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 76e8c20..cea20b7 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 c388aba..c13a997 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 5cc5d7b..f286b78 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 368896b..2677b08 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 01be6bc..7b5c793 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 c2f5d24..5cdca2b 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 f1bc1a4..103f6cc 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 433096e..36d7c50 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 031e7b6..94f19b1 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 e30b939..c831177 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 77f42cc..ada40c4 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 634ccce..afbf28a 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 8806d4d..65760dc 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 3769de1..71651fe 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 deac869..b2b2952 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 f8cedda..c5f9fa6 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@xxxxxxxxxx>
#
# 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 8fc672d..cabef7c 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 93e82a8..eafe0c7 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 ab25486..70bb603 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 b50c8df..4318b56 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 e193e06..43408d6 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@xxxxxxxxxx>
#
# 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 26fa6c4..2b1e1eb 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 0132de4..4212af5 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 5643bc3..9da44bf 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 b9b0857..76f505b 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@xxxxxxxxxx>
#
# 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 c24366e..ec5ecfe 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 abc6d29..0ae1049 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 bf1ef78..8fd471d 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 d96bab7..a34f098 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 6bf7359..ed1bd72 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 cf5490d..856e021 100644
--- a/virtinst/devicememballoon.py
+++ b/virtinst/devicememballoon.py
@@ -1,12 +1,12 @@
# Copyright (C) 2013 Red Hat, Inc.
#
# Copyright 2012
-# Eiichi Tsukata <devel@xxxxxxxxxxxx>
+# Eiichi Tsukata <devel@xxxxxxxxxxxx>
#
# 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 f939f31..2837585 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 c28dde0..71fdbd3 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@xxxxxxxxxx>
#
# 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 b1d0229..635ad6d 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 3ab2b9a..fa99011 100644
--- a/virtinst/devicetpm.py
+++ b/virtinst/devicetpm.py
@@ -4,13 +4,13 @@
# Cole Robinson <crobinso@xxxxxxxxxx>
# Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
#
-# Copyright 2013 IBM Corporation
+# Copyright 2013 IBM Corporation
# Author: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>
#
# 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 1552a22..922f07c 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 1db472f..93ec8f2 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 bf78c39..5692004 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 c9db7dd..7acabd1 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 48ed70b..71d5922 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 7652ee5..86b4690 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 d3a27c7..dc165ea 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@xxxxxxxxxx>
#
# 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 38694d9..904333e 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 efe7255..375670c 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 853c07c..c1e0c88 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 502c1ce..8925dc3 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 e0d85fb..a0a9d9c 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 9a0fc2e..819698b 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 7b6a894..473fd12 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 7aa525a..76afb1d 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 44d8588..91d7237 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 0623fae..4b6e581 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 ac6ecd9..415eb45 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 a60abda..a31d7de 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@xxxxxxxxxx>
#
# 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 c32038d..f79192e 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@xxxxxxxxxx>
#
# 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 38c04de..f85e8e9 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@xxxxxxxxxx>
#
# 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 e56c225..86cd78c 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@xxxxxxxxxx>
#
# 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
--
1.8.3.1
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
