From 48e32b429d0db08aca2b612ec2ff46d0e1b0f36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 4 Apr 2018 14:35:41 +0100 Subject: [PATCH] Fix copyright header to specify GPLv2 or later, not GPLv2 only. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The copyright headers in every file were chjanged in this previous commit commit b6dcee8eb7ec4de999058c187162fe4aedef36b4 Author: Cole Robinson Date: Tue Mar 20 15:00:02 2018 -0400 Use consistent and minimal license header for every file Where before this they said " "either version 2 of the License, or (at your option) any later version." Now they just say "GNU GPLv2" This fixes it to say "GNU GPLv2 or later" again. Signed-off-by: Daniel P. Berrangé --- setup.py | 2 +- tests/__init__.py | 2 +- tests/capabilities.py | 2 +- tests/checkprops.py | 2 +- tests/clitest.py | 2 +- tests/clonetest.py | 2 +- tests/dist.py | 2 +- tests/hostkeymap.py | 2 +- tests/interface.py | 2 +- tests/nodedev.py | 2 +- tests/osdict.py | 2 +- tests/storage.py | 2 +- tests/test_inject.py | 2 +- tests/test_urls.py | 2 +- tests/uitests/__init__.py | 2 +- tests/uitests/about.py | 2 +- tests/uitests/addhardware.py | 2 +- tests/uitests/choosecd.py | 2 +- tests/uitests/cli.py | 2 +- tests/uitests/clonevm.py | 2 +- tests/uitests/connect.py | 2 +- tests/uitests/console.py | 2 +- tests/uitests/createinterface.py | 2 +- tests/uitests/createnet.py | 2 +- tests/uitests/createpool.py | 2 +- tests/uitests/createvol.py | 2 +- tests/uitests/details.py | 2 +- tests/uitests/host.py | 2 +- tests/uitests/manager.py | 2 +- tests/uitests/migrate.py | 2 +- tests/uitests/newvm.py | 2 +- tests/uitests/prefs.py | 2 +- tests/uitests/snapshot.py | 2 +- tests/uitests/utils.py | 2 +- tests/uriparse.py | 2 +- tests/utils.py | 2 +- tests/virtconvtest.py | 2 +- tests/xmlconfig.py | 2 +- tests/xmlparse.py | 2 +- virt-clone | 2 +- virt-convert | 2 +- virt-install | 2 +- virt-manager | 2 +- virt-xml | 2 +- virtManager/__init__.py | 2 +- virtManager/about.py | 2 +- virtManager/addhardware.py | 2 +- virtManager/addstorage.py | 2 +- virtManager/asyncjob.py | 2 +- virtManager/baseclass.py | 2 +- virtManager/choosecd.py | 2 +- virtManager/clone.py | 2 +- virtManager/config.py | 2 +- virtManager/connect.py | 2 +- virtManager/connectauth.py | 2 +- virtManager/connection.py | 2 +- virtManager/connmanager.py | 2 +- virtManager/console.py | 2 +- virtManager/create.py | 2 +- virtManager/createinterface.py | 2 +- virtManager/createnet.py | 2 +- virtManager/createpool.py | 2 +- virtManager/createvol.py | 2 +- virtManager/delete.py | 2 +- virtManager/details.py | 2 +- virtManager/domain.py | 2 +- virtManager/engine.py | 2 +- virtManager/error.py | 2 +- virtManager/fsdetails.py | 2 +- virtManager/gfxdetails.py | 2 +- virtManager/graphwidgets.py | 2 +- virtManager/host.py | 2 +- virtManager/inspection.py | 2 +- virtManager/interface.py | 2 +- virtManager/keyring.py | 2 +- virtManager/libvirtenummap.py | 2 +- virtManager/libvirtobject.py | 2 +- virtManager/manager.py | 2 +- virtManager/mediacombo.py | 2 +- virtManager/migrate.py | 2 +- virtManager/module_trace.py | 2 +- virtManager/netlist.py | 2 +- virtManager/network.py | 2 +- virtManager/nodedev.py | 2 +- virtManager/packageutils.py | 2 +- virtManager/preferences.py | 2 +- virtManager/serialcon.py | 2 +- virtManager/snapshots.py | 2 +- virtManager/sshtunnels.py | 2 +- virtManager/storagebrowse.py | 2 +- virtManager/storagelist.py | 2 +- virtManager/storagepool.py | 2 +- virtManager/systray.py | 2 +- virtManager/uiutil.py | 2 +- virtManager/viewers.py | 2 +- virtManager/vmmenu.py | 2 +- virtcli/__init__.py | 2 +- virtcli/cliconfig.py | 2 +- virtconv/__init__.py | 2 +- virtconv/formats.py | 2 +- virtconv/ovf.py | 2 +- virtconv/vmx.py | 2 +- virtinst/__init__.py | 2 +- virtinst/capabilities.py | 2 +- virtinst/cli.py | 2 +- virtinst/cloner.py | 2 +- virtinst/connection.py | 2 +- virtinst/devices/__init__.py | 2 +- virtinst/devices/char.py | 2 +- virtinst/devices/controller.py | 2 +- virtinst/devices/device.py | 2 +- virtinst/devices/disk.py | 2 +- virtinst/devices/filesystem.py | 2 +- virtinst/devices/graphics.py | 2 +- virtinst/devices/hostdev.py | 2 +- virtinst/devices/input.py | 2 +- virtinst/devices/interface.py | 2 +- virtinst/devices/memballoon.py | 2 +- virtinst/devices/memory.py | 2 +- virtinst/devices/panic.py | 2 +- virtinst/devices/redirdev.py | 2 +- virtinst/devices/rng.py | 2 +- virtinst/devices/smartcard.py | 2 +- virtinst/devices/sound.py | 2 +- virtinst/devices/tpm.py | 2 +- virtinst/devices/video.py | 2 +- virtinst/devices/watchdog.py | 2 +- virtinst/diskbackend.py | 2 +- virtinst/distroinstaller.py | 2 +- virtinst/domain/__init__.py | 2 +- virtinst/domain/blkiotune.py | 2 +- virtinst/domain/clock.py | 2 +- virtinst/domain/cpu.py | 2 +- virtinst/domain/cputune.py | 2 +- virtinst/domain/features.py | 2 +- virtinst/domain/idmap.py | 2 +- virtinst/domain/memorybacking.py | 2 +- virtinst/domain/memtune.py | 2 +- virtinst/domain/numatune.py | 2 +- virtinst/domain/os.py | 2 +- virtinst/domain/pm.py | 2 +- virtinst/domain/resource.py | 2 +- virtinst/domain/seclabel.py | 2 +- virtinst/domain/sysinfo.py | 2 +- virtinst/domain/xmlnsqemu.py | 2 +- virtinst/domcapabilities.py | 2 +- virtinst/guest.py | 2 +- virtinst/hostkeymap.py | 2 +- virtinst/initrdinject.py | 2 +- virtinst/installer.py | 2 +- virtinst/interface.py | 2 +- virtinst/kernelupload.py | 2 +- virtinst/network.py | 2 +- virtinst/nodedev.py | 2 +- virtinst/osdict.py | 2 +- virtinst/pollhelpers.py | 2 +- virtinst/progress.py | 2 +- virtinst/snapshot.py | 2 +- virtinst/storage.py | 2 +- virtinst/support.py | 2 +- virtinst/uri.py | 2 +- virtinst/urldetect.py | 2 +- virtinst/urlfetcher.py | 2 +- virtinst/util.py | 2 +- virtinst/xmlapi.py | 2 +- virtinst/xmlbuilder.py | 2 +- 166 files changed, 166 insertions(+), 166 deletions(-) diff --git a/setup.py b/setup.py index 588a35cbe..7ca6d6777 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/tests/__init__.py b/tests/__init__.py index 78de60e5f..2052ab922 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import atexit diff --git a/tests/capabilities.py b/tests/capabilities.py index 766892637..c15a9dd3a 100644 --- a/tests/capabilities.py +++ b/tests/capabilities.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/tests/checkprops.py b/tests/checkprops.py index 018b6e555..3e7e8977c 100644 --- a/tests/checkprops.py +++ b/tests/checkprops.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/tests/clitest.py b/tests/clitest.py index 00c8e52e6..cd5e98f8b 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import atexit diff --git a/tests/clonetest.py b/tests/clonetest.py index e7e9ebe8d..82b3fdf20 100644 --- a/tests/clonetest.py +++ b/tests/clonetest.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import unittest diff --git a/tests/dist.py b/tests/dist.py index 418586f37..b5ae080e9 100644 --- a/tests/dist.py +++ b/tests/dist.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import fileinput diff --git a/tests/hostkeymap.py b/tests/hostkeymap.py index 42b4de6ed..a200d80f5 100644 --- a/tests/hostkeymap.py +++ b/tests/hostkeymap.py @@ -1,6 +1,6 @@ # Copyright (C) 2017 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/tests/interface.py b/tests/interface.py index 7b88cb176..467c1cc9a 100644 --- a/tests/interface.py +++ b/tests/interface.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/tests/nodedev.py b/tests/nodedev.py index fea9ea7f5..a79d1f86e 100644 --- a/tests/nodedev.py +++ b/tests/nodedev.py @@ -2,7 +2,7 @@ # # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os.path diff --git a/tests/osdict.py b/tests/osdict.py index 06bb8929c..62d3ca7bd 100644 --- a/tests/osdict.py +++ b/tests/osdict.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import unittest diff --git a/tests/storage.py b/tests/storage.py index 51bf33e00..a812b9674 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/tests/test_inject.py b/tests/test_inject.py index 14946dc29..035abc1f4 100755 --- a/tests/test_inject.py +++ b/tests/test_inject.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/tests/test_urls.py b/tests/test_urls.py index ee30cb212..4390ba837 100644 --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/tests/uitests/__init__.py b/tests/uitests/__init__.py index 0fc5b1631..fa9cef6f4 100644 --- a/tests/uitests/__init__.py +++ b/tests/uitests/__init__.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/tests/uitests/about.py b/tests/uitests/about.py index ed0df8441..aadfc71b7 100644 --- a/tests/uitests/about.py +++ b/tests/uitests/about.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import datetime diff --git a/tests/uitests/addhardware.py b/tests/uitests/addhardware.py index 212796520..8d6ad31ce 100644 --- a/tests/uitests/addhardware.py +++ b/tests/uitests/addhardware.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import tests diff --git a/tests/uitests/choosecd.py b/tests/uitests/choosecd.py index 8ef85c805..acdd17d17 100644 --- a/tests/uitests/choosecd.py +++ b/tests/uitests/choosecd.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/cli.py b/tests/uitests/cli.py index 88f5f189d..1ca97bf61 100644 --- a/tests/uitests/cli.py +++ b/tests/uitests/cli.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/clonevm.py b/tests/uitests/clonevm.py index b7386336d..ac62f4ea7 100644 --- a/tests/uitests/clonevm.py +++ b/tests/uitests/clonevm.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/connect.py b/tests/uitests/connect.py index f2a89a362..c56d19b36 100644 --- a/tests/uitests/connect.py +++ b/tests/uitests/connect.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/console.py b/tests/uitests/console.py index 220d9f829..78fcd237a 100644 --- a/tests/uitests/console.py +++ b/tests/uitests/console.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/tests/uitests/createinterface.py b/tests/uitests/createinterface.py index 5c6f65e03..f754891b1 100644 --- a/tests/uitests/createinterface.py +++ b/tests/uitests/createinterface.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/createnet.py b/tests/uitests/createnet.py index b8babd6ad..07579f952 100644 --- a/tests/uitests/createnet.py +++ b/tests/uitests/createnet.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/createpool.py b/tests/uitests/createpool.py index 74e2523de..f7b8e81b0 100644 --- a/tests/uitests/createpool.py +++ b/tests/uitests/createpool.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/createvol.py b/tests/uitests/createvol.py index e2b7edee8..c8b210345 100644 --- a/tests/uitests/createvol.py +++ b/tests/uitests/createvol.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/details.py b/tests/uitests/details.py index 805537975..b309c8c2a 100644 --- a/tests/uitests/details.py +++ b/tests/uitests/details.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/host.py b/tests/uitests/host.py index bd7e84a00..68fcebc1d 100644 --- a/tests/uitests/host.py +++ b/tests/uitests/host.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/manager.py b/tests/uitests/manager.py index 6f521125d..43e776386 100644 --- a/tests/uitests/manager.py +++ b/tests/uitests/manager.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import dogtail.rawinput diff --git a/tests/uitests/migrate.py b/tests/uitests/migrate.py index 8c81ad723..2990f35b3 100644 --- a/tests/uitests/migrate.py +++ b/tests/uitests/migrate.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/newvm.py b/tests/uitests/newvm.py index ebcd36539..ce65139f7 100644 --- a/tests/uitests/newvm.py +++ b/tests/uitests/newvm.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import time diff --git a/tests/uitests/prefs.py b/tests/uitests/prefs.py index a969ab021..c55fc2dbe 100644 --- a/tests/uitests/prefs.py +++ b/tests/uitests/prefs.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/snapshot.py b/tests/uitests/snapshot.py index 8a586c2a4..e8e9d6cf5 100644 --- a/tests/uitests/snapshot.py +++ b/tests/uitests/snapshot.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from tests.uitests import utils as uiutils diff --git a/tests/uitests/utils.py b/tests/uitests/utils.py index 65c35079c..4af451b39 100644 --- a/tests/uitests/utils.py +++ b/tests/uitests/utils.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/tests/uriparse.py b/tests/uriparse.py index 563773414..5f7338204 100644 --- a/tests/uriparse.py +++ b/tests/uriparse.py @@ -1,6 +1,6 @@ # Copyright (C) 2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import unittest diff --git a/tests/utils.py b/tests/utils.py index 54ef30cb1..bf44ca33c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import difflib diff --git a/tests/virtconvtest.py b/tests/virtconvtest.py index bf6d6adee..efe97c50c 100644 --- a/tests/virtconvtest.py +++ b/tests/virtconvtest.py @@ -1,6 +1,6 @@ # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import io diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py index 3bbde296c..64cd56ebe 100644 --- a/tests/xmlconfig.py +++ b/tests/xmlconfig.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/tests/xmlparse.py b/tests/xmlparse.py index bbe536c15..3e02a5c1e 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import glob diff --git a/virt-clone b/virt-clone index 39f186bc6..33a807412 100755 --- a/virt-clone +++ b/virt-clone @@ -2,7 +2,7 @@ # # Copyright(c) FUJITSU Limited 2007. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/virt-convert b/virt-convert index 77ecd599a..a765a1772 100755 --- a/virt-convert +++ b/virt-convert @@ -7,7 +7,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import sys diff --git a/virt-install b/virt-install index 2082ca866..c0a028c96 100755 --- a/virt-install +++ b/virt-install @@ -2,7 +2,7 @@ # # Copyright 2005-2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import argparse diff --git a/virt-manager b/virt-manager index 2e8826af5..664b7ba7e 100755 --- a/virt-manager +++ b/virt-manager @@ -3,7 +3,7 @@ # Copyright (C) 2006, 2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import argparse diff --git a/virt-xml b/virt-xml index a287fd76c..9ee96e0e4 100755 --- a/virt-xml +++ b/virt-xml @@ -3,7 +3,7 @@ # Copyright 2013-2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import difflib diff --git a/virtManager/__init__.py b/virtManager/__init__.py index 611997580..454c44c00 100644 --- a/virtManager/__init__.py +++ b/virtManager/__init__.py @@ -1,5 +1,5 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/virtManager/about.py b/virtManager/about.py index 70ca2f61d..e8b50c417 100644 --- a/virtManager/about.py +++ b/virtManager/about.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index b0cdec46c..e9bb30edd 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -1,7 +1,7 @@ # Copyright (C) 2006-2007, 2012-2015 Red Hat, Inc. # Copyright (C) 2006 Hugh O. Brock # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py index 68701eba2..91ff18825 100644 --- a/virtManager/addstorage.py +++ b/virtManager/addstorage.py @@ -1,6 +1,6 @@ # Copyright (C) 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/asyncjob.py b/virtManager/asyncjob.py index 55511e47f..b121570f4 100644 --- a/virtManager/asyncjob.py +++ b/virtManager/asyncjob.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Hugh O. Brock # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import threading diff --git a/virtManager/baseclass.py b/virtManager/baseclass.py index 9ae161174..c26264af1 100644 --- a/virtManager/baseclass.py +++ b/virtManager/baseclass.py @@ -1,7 +1,7 @@ # Copyright (C) 2010, 2013 Red Hat, Inc. # Copyright (C) 2010 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/choosecd.py b/virtManager/choosecd.py index 7ae7b4460..5be91c962 100644 --- a/virtManager/choosecd.py +++ b/virtManager/choosecd.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013, 2014 Red Hat, Inc. # Copyright (C) 2006 Hugh O. Brock # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/clone.py b/virtManager/clone.py index 23a95e61d..0615de898 100644 --- a/virtManager/clone.py +++ b/virtManager/clone.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/config.py b/virtManager/config.py index 1b7bddc2d..c4272149d 100644 --- a/virtManager/config.py +++ b/virtManager/config.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2012-2015 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtManager/connect.py b/virtManager/connect.py index a08c9f4a8..f0d61dfcb 100644 --- a/virtManager/connect.py +++ b/virtManager/connect.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import glob diff --git a/virtManager/connectauth.py b/virtManager/connectauth.py index 774057ec1..5eca0d78c 100644 --- a/virtManager/connectauth.py +++ b/virtManager/connectauth.py @@ -1,7 +1,7 @@ # Copyright (C) 2012-2013 Red Hat, Inc. # Copyright (C) 2012 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import collections diff --git a/virtManager/connection.py b/virtManager/connection.py index 0f364cc94..6340b2342 100644 --- a/virtManager/connection.py +++ b/virtManager/connection.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013, 2014, 2015 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/connmanager.py b/virtManager/connmanager.py index 7315764ab..6ae4aff2c 100644 --- a/virtManager/connmanager.py +++ b/virtManager/connmanager.py @@ -1,6 +1,6 @@ # Copyright (C) 2018 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/console.py b/virtManager/console.py index 47687ff70..30d0c83ec 100644 --- a/virtManager/console.py +++ b/virtManager/console.py @@ -2,7 +2,7 @@ # Copyright (C) 2006 Daniel P. Berrange # Copyright (C) 2010 Marc-Andre Lureau # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/create.py b/virtManager/create.py index d07b28dca..5afe0afef 100644 --- a/virtManager/create.py +++ b/virtManager/create.py @@ -1,7 +1,7 @@ # Copyright (C) 2008, 2013, 2014, 2015 Red Hat, Inc. # Copyright (C) 2008 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import io diff --git a/virtManager/createinterface.py b/virtManager/createinterface.py index 634465555..36deb7fe0 100644 --- a/virtManager/createinterface.py +++ b/virtManager/createinterface.py @@ -1,7 +1,7 @@ # Copyright (C) 2008, 2013 Red Hat, Inc. # Copyright (C) 2008 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/createnet.py b/virtManager/createnet.py index 9f5c3e3b0..6736daa5f 100644 --- a/virtManager/createnet.py +++ b/virtManager/createnet.py @@ -1,7 +1,7 @@ # Copyright (C) 2006-2007, 2013 Red Hat, Inc. # Copyright (C) 2006 Hugh O. Brock # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import ipaddress diff --git a/virtManager/createpool.py b/virtManager/createpool.py index 82502528d..e43aae791 100644 --- a/virtManager/createpool.py +++ b/virtManager/createpool.py @@ -1,7 +1,7 @@ # Copyright (C) 2008, 2013, 2014 Red Hat, Inc. # Copyright (C) 2008 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/createvol.py b/virtManager/createvol.py index dcc45530a..0bf247f2c 100644 --- a/virtManager/createvol.py +++ b/virtManager/createvol.py @@ -1,7 +1,7 @@ # Copyright (C) 2008, 2013, 2014 Red Hat, Inc. # Copyright (C) 2008 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/delete.py b/virtManager/delete.py index e49985f2e..94d97c6be 100644 --- a/virtManager/delete.py +++ b/virtManager/delete.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2012-2014 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtManager/details.py b/virtManager/details.py index fd669fc56..45d475a8f 100644 --- a/virtManager/details.py +++ b/virtManager/details.py @@ -1,7 +1,7 @@ # Copyright (C) 2006-2008, 2013, 2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/domain.py b/virtManager/domain.py index 0b88e1c54..1cc03682d 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013, 2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/engine.py b/virtManager/engine.py index 9ca2d4ea1..a431f464f 100644 --- a/virtManager/engine.py +++ b/virtManager/engine.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013-2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/error.py b/virtManager/error.py index 7480de911..2fca46db3 100644 --- a/virtManager/error.py +++ b/virtManager/error.py @@ -1,6 +1,6 @@ # Copyright (C) 2007, 2013-2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/fsdetails.py b/virtManager/fsdetails.py index cbeb7c1f0..2c0f12297 100644 --- a/virtManager/fsdetails.py +++ b/virtManager/fsdetails.py @@ -2,7 +2,7 @@ # Copyright (C) 2006 Hugh O. Brock # Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from gi.repository import Gtk diff --git a/virtManager/gfxdetails.py b/virtManager/gfxdetails.py index b3ff67e90..c2207dd69 100644 --- a/virtManager/gfxdetails.py +++ b/virtManager/gfxdetails.py @@ -2,7 +2,7 @@ # Copyright (C) 2006 Hugh O. Brock # Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from gi.repository import Gtk diff --git a/virtManager/graphwidgets.py b/virtManager/graphwidgets.py index 2d747c5fd..ae86e41ea 100644 --- a/virtManager/graphwidgets.py +++ b/virtManager/graphwidgets.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from gi.repository import GObject diff --git a/virtManager/host.py b/virtManager/host.py index 473504e21..8cac076b4 100644 --- a/virtManager/host.py +++ b/virtManager/host.py @@ -1,7 +1,7 @@ # Copyright (C) 2007, 2013-2014 Red Hat, Inc. # Copyright (C) 2007 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import functools diff --git a/virtManager/inspection.py b/virtManager/inspection.py index 36f359355..ea6123b84 100644 --- a/virtManager/inspection.py +++ b/virtManager/inspection.py @@ -1,6 +1,6 @@ # Copyright (C) 2011, 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import functools diff --git a/virtManager/interface.py b/virtManager/interface.py index 96f442252..525ac583d 100644 --- a/virtManager/interface.py +++ b/virtManager/interface.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from virtinst import Interface diff --git a/virtManager/keyring.py b/virtManager/keyring.py index 006a82739..d8be8b0c8 100644 --- a/virtManager/keyring.py +++ b/virtManager/keyring.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/libvirtenummap.py b/virtManager/libvirtenummap.py index 5c31c2d44..eaad0374c 100644 --- a/virtManager/libvirtenummap.py +++ b/virtManager/libvirtenummap.py @@ -1,6 +1,6 @@ # Copyright (C) 2018 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/libvirtobject.py b/virtManager/libvirtobject.py index eaeffe37d..c933253fc 100644 --- a/virtManager/libvirtobject.py +++ b/virtManager/libvirtobject.py @@ -1,7 +1,7 @@ # Copyright (C) 2010, 2013 Red Hat, Inc. # Copyright (C) 2010 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/manager.py b/virtManager/manager.py index f0f4d19eb..99cc5b169 100644 --- a/virtManager/manager.py +++ b/virtManager/manager.py @@ -1,7 +1,7 @@ # Copyright (C) 2006-2008, 2013-2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/mediacombo.py b/virtManager/mediacombo.py index 2f5779439..a3493cb76 100644 --- a/virtManager/mediacombo.py +++ b/virtManager/mediacombo.py @@ -1,6 +1,6 @@ # Copyright (C) 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/migrate.py b/virtManager/migrate.py index e3bb47e62..a03bbb05b 100644 --- a/virtManager/migrate.py +++ b/virtManager/migrate.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/module_trace.py b/virtManager/module_trace.py index 3557b4b85..64dd3c79e 100644 --- a/virtManager/module_trace.py +++ b/virtManager/module_trace.py @@ -1,7 +1,7 @@ # Copyright (C) 2011, 2013 Red Hat, Inc. # Copyright (C) 2011 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # This module provides a simple way to trace any activity on a specific diff --git a/virtManager/netlist.py b/virtManager/netlist.py index 12c09787d..3250be7f5 100644 --- a/virtManager/netlist.py +++ b/virtManager/netlist.py @@ -1,6 +1,6 @@ # Copyright (C) 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/network.py b/virtManager/network.py index 411b4dcb8..d6679a69a 100644 --- a/virtManager/network.py +++ b/virtManager/network.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013-2014 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import ipaddress diff --git a/virtManager/nodedev.py b/virtManager/nodedev.py index 714dc9890..9b51ab59e 100644 --- a/virtManager/nodedev.py +++ b/virtManager/nodedev.py @@ -1,7 +1,7 @@ # Copyright (C) 2011, 2013 Red Hat, Inc. # Copyright (C) 2011 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from virtinst import NodeDevice diff --git a/virtManager/packageutils.py b/virtManager/packageutils.py index 3fda77c8c..a10d2306a 100644 --- a/virtManager/packageutils.py +++ b/virtManager/packageutils.py @@ -1,7 +1,7 @@ # Copyright (C) 2012-2013 Red Hat, Inc. # Copyright (C) 2012 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/preferences.py b/virtManager/preferences.py index f9a22d74b..d53df10ef 100644 --- a/virtManager/preferences.py +++ b/virtManager/preferences.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2012-2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py index 05ec83ae5..504281001 100644 --- a/virtManager/serialcon.py +++ b/virtManager/serialcon.py @@ -1,7 +1,7 @@ # Copyright (C) 2006, 2013 Red Hat, Inc. # Copyright (C) 2006 Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtManager/snapshots.py b/virtManager/snapshots.py index c714c78e2..afbbacebe 100644 --- a/virtManager/snapshots.py +++ b/virtManager/snapshots.py @@ -1,7 +1,7 @@ # Copyright (C) 2013-2014 Red Hat, Inc. # Copyright (C) 2013 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import datetime diff --git a/virtManager/sshtunnels.py b/virtManager/sshtunnels.py index e5a67befb..25e95085b 100644 --- a/virtManager/sshtunnels.py +++ b/virtManager/sshtunnels.py @@ -1,6 +1,6 @@ # Copyright (C) 2014, 2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import functools diff --git a/virtManager/storagebrowse.py b/virtManager/storagebrowse.py index 7e1cb1dd5..553edd441 100644 --- a/virtManager/storagebrowse.py +++ b/virtManager/storagebrowse.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013, 2014 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/storagelist.py b/virtManager/storagelist.py index 77c47cc64..bc760e1e0 100644 --- a/virtManager/storagelist.py +++ b/virtManager/storagelist.py @@ -1,6 +1,6 @@ # Copyright (C) 2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/storagepool.py b/virtManager/storagepool.py index ccdb30827..bf79b1616 100644 --- a/virtManager/storagepool.py +++ b/virtManager/storagepool.py @@ -1,7 +1,7 @@ # Copyright (C) 2008, 2013 Red Hat, Inc. # Copyright (C) 2008 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/systray.py b/virtManager/systray.py index dc1764b37..a28979732 100644 --- a/virtManager/systray.py +++ b/virtManager/systray.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/uiutil.py b/virtManager/uiutil.py index 8eb1e3936..564243037 100644 --- a/virtManager/uiutil.py +++ b/virtManager/uiutil.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013, 2014 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from gi.repository import GObject diff --git a/virtManager/viewers.py b/virtManager/viewers.py index 09f994454..7ccf5fbdc 100644 --- a/virtManager/viewers.py +++ b/virtManager/viewers.py @@ -2,7 +2,7 @@ # Copyright (C) 2006 Daniel P. Berrange # Copyright (C) 2010 Marc-Andre Lureau # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtManager/vmmenu.py b/virtManager/vmmenu.py index 0af04ceb3..7005c2f3f 100644 --- a/virtManager/vmmenu.py +++ b/virtManager/vmmenu.py @@ -1,7 +1,7 @@ # Copyright (C) 2009, 2013, 2014 Red Hat, Inc. # Copyright (C) 2009 Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtcli/__init__.py b/virtcli/__init__.py index 9958d8837..c354dd060 100644 --- a/virtcli/__init__.py +++ b/virtcli/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2013-2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .cliconfig import CLIConfig diff --git a/virtcli/cliconfig.py b/virtcli/cliconfig.py index e6a8d2a17..0fb2f0e8c 100644 --- a/virtcli/cliconfig.py +++ b/virtcli/cliconfig.py @@ -1,7 +1,7 @@ # # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtconv/__init__.py b/virtconv/__init__.py index a0a94febf..e1243c2fb 100644 --- a/virtconv/__init__.py +++ b/virtconv/__init__.py @@ -3,7 +3,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtconv/formats.py b/virtconv/formats.py index a66784525..c0449f630 100644 --- a/virtconv/formats.py +++ b/virtconv/formats.py @@ -3,7 +3,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtconv/ovf.py b/virtconv/ovf.py index a79dc7e2a..3cd9319b6 100644 --- a/virtconv/ovf.py +++ b/virtconv/ovf.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtconv/vmx.py b/virtconv/vmx.py index f93978f9f..97e06795d 100644 --- a/virtconv/vmx.py +++ b/virtconv/vmx.py @@ -3,7 +3,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtinst/__init__.py b/virtinst/__init__.py index bda92bbef..1a88af721 100644 --- a/virtinst/__init__.py +++ b/virtinst/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2013, 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from virtcli import CLIConfig as _CLIConfig diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py index 8c6e1fcd8..ec90f7976 100644 --- a/virtinst/capabilities.py +++ b/virtinst/capabilities.py @@ -4,7 +4,7 @@ # Copyright 2007, 2012-2014 Red Hat, Inc. # Mark McLoughlin # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/cli.py b/virtinst/cli.py index e697a3da7..05393e581 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -4,7 +4,7 @@ # Copyright 2006-2007, 2013, 2014 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import argparse diff --git a/virtinst/cloner.py b/virtinst/cloner.py index 0fb02034e..c510c6e3d 100644 --- a/virtinst/cloner.py +++ b/virtinst/cloner.py @@ -4,7 +4,7 @@ # # Cloning a virtual machine module. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/connection.py b/virtinst/connection.py index 0e1950025..3ae35aa65 100644 --- a/virtinst/connection.py +++ b/virtinst/connection.py @@ -1,7 +1,7 @@ # # Copyright 2013, 2014, 2015 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/devices/__init__.py b/virtinst/devices/__init__.py index 268b5ef09..6da0766de 100644 --- a/virtinst/devices/__init__.py +++ b/virtinst/devices/__init__.py @@ -1,6 +1,6 @@ # Copyright (C) 2018 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/virtinst/devices/char.py b/virtinst/devices/char.py index ff16a5f39..3f364d765 100644 --- a/virtinst/devices/char.py +++ b/virtinst/devices/char.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/controller.py b/virtinst/devices/controller.py index 6596a6422..3b2f73a37 100644 --- a/virtinst/devices/controller.py +++ b/virtinst/devices/controller.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013, 2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/device.py b/virtinst/devices/device.py index 72eded397..32fab4551 100644 --- a/virtinst/devices/device.py +++ b/virtinst/devices/device.py @@ -4,7 +4,7 @@ # Copyright 2008, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py index 6ba660369..e104c06cc 100644 --- a/virtinst/devices/disk.py +++ b/virtinst/devices/disk.py @@ -4,7 +4,7 @@ # Copyright 2006-2008, 2012-2014 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtinst/devices/filesystem.py b/virtinst/devices/filesystem.py index a64f43acd..f00f1d91f 100644 --- a/virtinst/devices/filesystem.py +++ b/virtinst/devices/filesystem.py @@ -2,7 +2,7 @@ # Copyright 2011, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtinst/devices/graphics.py b/virtinst/devices/graphics.py index 1dda935c5..839ece9e3 100644 --- a/virtinst/devices/graphics.py +++ b/virtinst/devices/graphics.py @@ -2,7 +2,7 @@ # Copyright 2006-2009, 2013 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtinst/devices/hostdev.py b/virtinst/devices/hostdev.py index 0c638095d..9dee3111f 100644 --- a/virtinst/devices/hostdev.py +++ b/virtinst/devices/hostdev.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/input.py b/virtinst/devices/input.py index da440845d..9962f9a3d 100644 --- a/virtinst/devices/input.py +++ b/virtinst/devices/input.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/interface.py b/virtinst/devices/interface.py index 8762af73c..062603520 100644 --- a/virtinst/devices/interface.py +++ b/virtinst/devices/interface.py @@ -2,7 +2,7 @@ # Copyright 2006-2009, 2013 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/devices/memballoon.py b/virtinst/devices/memballoon.py index 7c0636880..63c0e4411 100644 --- a/virtinst/devices/memballoon.py +++ b/virtinst/devices/memballoon.py @@ -3,7 +3,7 @@ # Copyright 2012 # Eiichi Tsukata # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/memory.py b/virtinst/devices/memory.py index 5246216bd..3c9a6a1a8 100644 --- a/virtinst/devices/memory.py +++ b/virtinst/devices/memory.py @@ -1,7 +1,7 @@ # # Copyright 2017 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/virtinst/devices/panic.py b/virtinst/devices/panic.py index ca3623fd8..ecb8111e2 100644 --- a/virtinst/devices/panic.py +++ b/virtinst/devices/panic.py @@ -2,7 +2,7 @@ # Copyright 2013 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/redirdev.py b/virtinst/devices/redirdev.py index c3ca04c5f..01bc50966 100644 --- a/virtinst/devices/redirdev.py +++ b/virtinst/devices/redirdev.py @@ -3,7 +3,7 @@ # Cole Robinson # Marc-Andre Lureau # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/rng.py b/virtinst/devices/rng.py index 518d50fe6..184003042 100644 --- a/virtinst/devices/rng.py +++ b/virtinst/devices/rng.py @@ -2,7 +2,7 @@ # Copyright 2013 Red Hat, Inc. # Giuseppe Scrivano # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/smartcard.py b/virtinst/devices/smartcard.py index 0d7597bf0..499ef7495 100644 --- a/virtinst/devices/smartcard.py +++ b/virtinst/devices/smartcard.py @@ -3,7 +3,7 @@ # Cole Robinson # Marc-Andre Lureau # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/sound.py b/virtinst/devices/sound.py index 2ef0b2976..e5ea6d211 100644 --- a/virtinst/devices/sound.py +++ b/virtinst/devices/sound.py @@ -2,7 +2,7 @@ # Copyright 2008-2009, 2013-2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/tpm.py b/virtinst/devices/tpm.py index 1161e93b1..a09b08e13 100644 --- a/virtinst/devices/tpm.py +++ b/virtinst/devices/tpm.py @@ -6,7 +6,7 @@ # Copyright 2013 IBM Corporation # Author: Stefan Berger # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/video.py b/virtinst/devices/video.py index c01349e59..2b1d5134e 100644 --- a/virtinst/devices/video.py +++ b/virtinst/devices/video.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/devices/watchdog.py b/virtinst/devices/watchdog.py index efa977986..5fbdaeafd 100644 --- a/virtinst/devices/watchdog.py +++ b/virtinst/devices/watchdog.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from .device import Device diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py index f04bb8706..56ab8761e 100644 --- a/virtinst/diskbackend.py +++ b/virtinst/diskbackend.py @@ -3,7 +3,7 @@ # # Copyright 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py index 8811971c9..17b4a2bce 100644 --- a/virtinst/distroinstaller.py +++ b/virtinst/distroinstaller.py @@ -2,7 +2,7 @@ # Copyright 2006-2009, 2013, 2014 Red Hat, Inc. # Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/domain/__init__.py b/virtinst/domain/__init__.py index 702e92b6e..992260fd1 100644 --- a/virtinst/domain/__init__.py +++ b/virtinst/domain/__init__.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. diff --git a/virtinst/domain/blkiotune.py b/virtinst/domain/blkiotune.py index a8a40bf64..217c2c6a9 100644 --- a/virtinst/domain/blkiotune.py +++ b/virtinst/domain/blkiotune.py @@ -2,7 +2,7 @@ # Copyright 2014 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/clock.py b/virtinst/domain/clock.py index a9574c577..d7fc7f38d 100644 --- a/virtinst/domain/clock.py +++ b/virtinst/domain/clock.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty diff --git a/virtinst/domain/cpu.py b/virtinst/domain/cpu.py index 3c1089c06..ff18efb15 100644 --- a/virtinst/domain/cpu.py +++ b/virtinst/domain/cpu.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty diff --git a/virtinst/domain/cputune.py b/virtinst/domain/cputune.py index eb3bd862f..67a76476e 100644 --- a/virtinst/domain/cputune.py +++ b/virtinst/domain/cputune.py @@ -1,6 +1,6 @@ # Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty diff --git a/virtinst/domain/features.py b/virtinst/domain/features.py index 3da223c53..6f0eaa4ea 100644 --- a/virtinst/domain/features.py +++ b/virtinst/domain/features.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/idmap.py b/virtinst/domain/idmap.py index f64e41cb0..24973f180 100644 --- a/virtinst/domain/idmap.py +++ b/virtinst/domain/idmap.py @@ -2,7 +2,7 @@ # Copyright 2014 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/memorybacking.py b/virtinst/domain/memorybacking.py index 8a3f8a47e..cef953374 100644 --- a/virtinst/domain/memorybacking.py +++ b/virtinst/domain/memorybacking.py @@ -2,7 +2,7 @@ # Copyright 2014 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/memtune.py b/virtinst/domain/memtune.py index 5d74ad9f7..3d8fde3c4 100644 --- a/virtinst/domain/memtune.py +++ b/virtinst/domain/memtune.py @@ -2,7 +2,7 @@ # Copyright 2014 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/numatune.py b/virtinst/domain/numatune.py index 1d075c183..6d65ee7af 100644 --- a/virtinst/domain/numatune.py +++ b/virtinst/domain/numatune.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import re diff --git a/virtinst/domain/os.py b/virtinst/domain/os.py index ac468ca1f..2bc12f703 100644 --- a/virtinst/domain/os.py +++ b/virtinst/domain/os.py @@ -2,7 +2,7 @@ # Copyright 2010, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty diff --git a/virtinst/domain/pm.py b/virtinst/domain/pm.py index fade00018..513442072 100644 --- a/virtinst/domain/pm.py +++ b/virtinst/domain/pm.py @@ -2,7 +2,7 @@ # Copyright 2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/resource.py b/virtinst/domain/resource.py index 673374d16..d0962db9a 100644 --- a/virtinst/domain/resource.py +++ b/virtinst/domain/resource.py @@ -2,7 +2,7 @@ # Copyright 2014 Fujitsu Limited. # Chen Hanxiao # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/seclabel.py b/virtinst/domain/seclabel.py index ee0e13930..dad9c0ebd 100644 --- a/virtinst/domain/seclabel.py +++ b/virtinst/domain/seclabel.py @@ -2,7 +2,7 @@ # Copyright 2010, 2012-2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/domain/sysinfo.py b/virtinst/domain/sysinfo.py index 2b6e02603..215df046a 100644 --- a/virtinst/domain/sysinfo.py +++ b/virtinst/domain/sysinfo.py @@ -2,7 +2,7 @@ # Copyright (C) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # Charles Arnold # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import datetime diff --git a/virtinst/domain/xmlnsqemu.py b/virtinst/domain/xmlnsqemu.py index 5b39a759d..c63a64819 100644 --- a/virtinst/domain/xmlnsqemu.py +++ b/virtinst/domain/xmlnsqemu.py @@ -1,7 +1,7 @@ # Copyright 2017 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py index 84b8e4322..5ea949488 100644 --- a/virtinst/domcapabilities.py +++ b/virtinst/domcapabilities.py @@ -3,7 +3,7 @@ # # Copyright 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/guest.py b/virtinst/guest.py index db354896a..dea897c68 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -4,7 +4,7 @@ # Copyright 2006-2009, 2013, 2014, 2015 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/hostkeymap.py b/virtinst/hostkeymap.py index 63b42da9d..416d7494d 100644 --- a/virtinst/hostkeymap.py +++ b/virtinst/hostkeymap.py @@ -1,7 +1,7 @@ # # Copyright 2006-2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py index 30ad3f38a..55898df22 100644 --- a/virtinst/initrdinject.py +++ b/virtinst/initrdinject.py @@ -2,7 +2,7 @@ # Copyright 2006-2009, 2013, 2014 Red Hat, Inc. # Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/installer.py b/virtinst/installer.py index ec8783857..0a89cf5ae 100644 --- a/virtinst/installer.py +++ b/virtinst/installer.py @@ -4,7 +4,7 @@ # Copyright 2006-2009, 2013 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtinst/interface.py b/virtinst/interface.py index caa2546be..623f78706 100644 --- a/virtinst/interface.py +++ b/virtinst/interface.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. """ Classes for building and installing libvirt interface xml diff --git a/virtinst/kernelupload.py b/virtinst/kernelupload.py index 6b9f030fa..e6e500be7 100644 --- a/virtinst/kernelupload.py +++ b/virtinst/kernelupload.py @@ -2,7 +2,7 @@ # Copyright 2006-2009, 2013, 2014 Red Hat, Inc. # Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/network.py b/virtinst/network.py index 91b23347a..5703b6e81 100644 --- a/virtinst/network.py +++ b/virtinst/network.py @@ -2,7 +2,7 @@ # Copyright 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. """ Classes for building and installing libvirt XML diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py index a55a7f962..ec92b3668 100644 --- a/virtinst/nodedev.py +++ b/virtinst/nodedev.py @@ -2,7 +2,7 @@ # Copyright 2009, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import logging diff --git a/virtinst/osdict.py b/virtinst/osdict.py index 314d104e7..425557c88 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -4,7 +4,7 @@ # Copyright 2006-2008, 2013-2014 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import datetime diff --git a/virtinst/pollhelpers.py b/virtinst/pollhelpers.py index b16d84cc0..37087abd2 100644 --- a/virtinst/pollhelpers.py +++ b/virtinst/pollhelpers.py @@ -1,7 +1,7 @@ # # Copyright (C) 2013 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtinst/progress.py b/virtinst/progress.py index 967d87644..9e5f918cf 100644 --- a/virtinst/progress.py +++ b/virtinst/progress.py @@ -1,4 +1,4 @@ -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # This file is part of urlgrabber, a high-level cross-protocol url-grabber diff --git a/virtinst/snapshot.py b/virtinst/snapshot.py index c11cde2a8..5e2b94a4c 100644 --- a/virtinst/snapshot.py +++ b/virtinst/snapshot.py @@ -2,7 +2,7 @@ # Copyright 2013-2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import libvirt diff --git a/virtinst/storage.py b/virtinst/storage.py index 656ab9e79..3a46d42c6 100644 --- a/virtinst/storage.py +++ b/virtinst/storage.py @@ -2,7 +2,7 @@ # Copyright 2008, 2013, 2015 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import os diff --git a/virtinst/support.py b/virtinst/support.py index a8ec76db2..e5bb4fdbc 100644 --- a/virtinst/support.py +++ b/virtinst/support.py @@ -4,7 +4,7 @@ # Copyright 2009, 2013, 2014 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import libvirt diff --git a/virtinst/uri.py b/virtinst/uri.py index 2aaa55af5..930940f23 100644 --- a/virtinst/uri.py +++ b/virtinst/uri.py @@ -1,7 +1,7 @@ # # Copyright 2014 Red Hat, Inc. # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtinst/urldetect.py b/virtinst/urldetect.py index 8361dbdc7..96c2b9af8 100644 --- a/virtinst/urldetect.py +++ b/virtinst/urldetect.py @@ -2,7 +2,7 @@ # Copyright 2006-2007, 2013 Red Hat, Inc. # Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import configparser diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py index c60f8abb5..fe410805a 100644 --- a/virtinst/urlfetcher.py +++ b/virtinst/urlfetcher.py @@ -2,7 +2,7 @@ # Copyright 2006-2007, 2013 Red Hat, Inc. # Daniel P. Berrange # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import ftplib diff --git a/virtinst/util.py b/virtinst/util.py index b47d31430..8233a8660 100644 --- a/virtinst/util.py +++ b/virtinst/util.py @@ -2,7 +2,7 @@ # Copyright 2006, 2013 Red Hat, Inc. # Jeremy Katz # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. # diff --git a/virtinst/xmlapi.py b/virtinst/xmlapi.py index 0e413f6cc..44993ce36 100644 --- a/virtinst/xmlapi.py +++ b/virtinst/xmlapi.py @@ -1,7 +1,7 @@ # # XML API wrappers # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import libxml2 diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py index 506d9b765..e5eaa6caf 100644 --- a/virtinst/xmlbuilder.py +++ b/virtinst/xmlbuilder.py @@ -4,7 +4,7 @@ # Copyright 2008, 2013 Red Hat, Inc. # Cole Robinson # -# This work is licensed under the GNU GPLv2. +# This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. import collections