[virt-tools-list] [PATCH 2/3] Fix copyright header to specify GPLv2 or later, not GPLv2 only.
Daniel P. Berrangé
berrange at redhat.com
Wed Apr 4 13:35:41 UTC 2018
The copyright headers in every file were chjanged in this previous commit
commit b6dcee8eb7ec4de999058c187162fe4aedef36b4
Author: Cole Robinson <crobinso at redhat.com>
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é <berrange at redhat.com>
---
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 588a35cb..7ca6d677 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 78de60e5..2052ab92 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 76689263..c15a9dd3 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 018b6e55..3e7e8977 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 00c8e52e..cd5e98f8 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 e7e9ebe8..82b3fdf2 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 418586f3..b5ae080e 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 42b4de6e..a200d80f 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 7b88cb17..467c1cc9 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 fea9ea7f..a79d1f86 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 06bb8929..62d3ca7b 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 51bf33e0..a812b967 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 14946dc2..035abc1f 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 ee30cb21..4390ba83 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 0fc5b163..fa9cef6f 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 ed0df844..aadfc71b 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 21279652..8d6ad31c 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 8ef85c80..acdd17d1 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 88f5f189..1ca97bf6 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 b7386336..ac62f4ea 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 f2a89a36..c56d19b3 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 220d9f82..78fcd237 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 5c6f65e0..f754891b 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 b8babd6a..07579f95 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 74e2523d..f7b8e81b 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 e2b7edee..c8b21034 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 80553797..b309c8c2 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 bd7e84a0..68fcebc1 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 6f521125..43e77638 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 8c81ad72..2990f35b 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 ebcd3653..ce65139f 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 a969ab02..c55fc2db 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 8a586c2a..e8e9d6cf 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 65c35079..4af451b3 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 56377341..5f733820 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 54ef30cb..bf44ca33 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 bf6d6ade..efe97c50 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 3bbde296..64cd56eb 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 bbe536c1..3e02a5c1 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 39f186bc..33a80741 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 77ecd599..a765a177 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 2082ca86..c0a028c9 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 2e8826af..664b7ba7 100755
--- a/virt-manager
+++ b/virt-manager
@@ -3,7 +3,7 @@
# Copyright (C) 2006, 2014 Red Hat, Inc.
# Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
#
-# 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 a287fd76..9ee96e0e 100755
--- a/virt-xml
+++ b/virt-xml
@@ -3,7 +3,7 @@
# Copyright 2013-2014 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 61199758..454c44c0 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 <berrange at redhat.com>
#
-# 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 70ca2f61..e8b50c41 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 <berrange at redhat.com>
#
-# 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 b0cdec46..e9bb30ed 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 <hbrock at redhat.com>
#
-# 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 68701eba..91ff1882 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 55511e47..b121570f 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 <hbrock at redhat.com>
#
-# 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 9ae16117..c26264af 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 <crobinso at redhat.com>
#
-# 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 7ae7b446..5be91c96 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 <hbrock at redhat.com>
#
-# 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 23a95e61..0615de89 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 <crobinso at redhat.com>
#
-# 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 1b7bddc2..c4272149 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 <berrange at redhat.com>
#
-# 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 a08c9f4a..f0d61dfc 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 <berrange at redhat.com>
#
-# 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 774057ec..5eca0d78 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 <crobinso at redhat.com>
#
-# 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 0f364cc9..6340b234 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 <berrange at redhat.com>
#
-# 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 7315764a..6ae4aff2 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 47687ff7..30d0c83e 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -2,7 +2,7 @@
# Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
# Copyright (C) 2010 Marc-Andre Lureau <marcandre.lureau at redhat.com>
#
-# 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 d07b28dc..5afe0afe 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 <crobinso at redhat.com>
#
-# 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 63446555..36deb7fe 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 <crobinso at redhat.com>
#
-# 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 9f5c3e3b..6736daa5 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 <hbrock at redhat.com>
#
-# 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 82502528..e43aae79 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 <crobinso at redhat.com>
#
-# 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 dcc45530..0bf247f2 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 <crobinso at redhat.com>
#
-# 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 e49985f2..94d97c6b 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 <crobinso at redhat.com>
#
-# 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 fd669fc5..45d475a8 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 <berrange at redhat.com>
#
-# 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 0b88e1c5..1cc03682 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 <berrange at redhat.com>
#
-# 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 9ca2d4ea..a431f464 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 <berrange at redhat.com>
#
-# 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 7480de91..2fca46db 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 cbeb7c1f..2c0f1229 100644
--- a/virtManager/fsdetails.py
+++ b/virtManager/fsdetails.py
@@ -2,7 +2,7 @@
# Copyright (C) 2006 Hugh O. Brock <hbrock at redhat.com>
# 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 b3ff67e9..c2207dd6 100644
--- a/virtManager/gfxdetails.py
+++ b/virtManager/gfxdetails.py
@@ -2,7 +2,7 @@
# Copyright (C) 2006 Hugh O. Brock <hbrock at redhat.com>
# 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 2d747c5f..ae86e41e 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 473504e2..8cac076b 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 <berrange at redhat.com>
#
-# 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 36f35935..ea6123b8 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 96f44225..525ac583 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 <crobinso at redhat.com>
#
-# 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 006a8273..d8be8b0c 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 <berrange at redhat.com>
#
-# 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 5c31c2d4..eaad0374 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 eaeffe37..c933253f 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 <crobinso at redhat.com>
#
-# 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 f0f4d19e..99cc5b16 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 <berrange at redhat.com>
#
-# 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 2f577943..a3493cb7 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 e3bb47e6..a03bbb05 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 <crobinso at redhat.com>
#
-# 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 3557b4b8..64dd3c79 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 <crobinso at redhat.com>
#
-# 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 12c09787..3250be7f 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 411b4dcb..d6679a69 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 <berrange at redhat.com>
#
-# 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 714dc989..9b51ab59 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 <crobinso at redhat.com>
#
-# 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 3fda77c8..a10d2306 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 <crobinso at redhat.com>
#
-# 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 f9a22d74..d53df10e 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 <berrange at redhat.com>
#
-# 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 05ec83ae..50428100 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 <berrange at redhat.com>
#
-# 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 c714c78e..afbbaceb 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 <crobinso at redhat.com>
#
-# 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 e5a67bef..25e95085 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 7e1cb1dd..553edd44 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 <crobinso at redhat.com>
#
-# 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 77c47cc6..bc760e1e 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 ccdb3082..bf79b161 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 <crobinso at redhat.com>
#
-# 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 dc1764b3..a2897973 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 <crobinso at redhat.com>
#
-# 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 8eb1e393..56424303 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 <crobinso at redhat.com>
#
-# 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 09f99445..7ccf5fbd 100644
--- a/virtManager/viewers.py
+++ b/virtManager/viewers.py
@@ -2,7 +2,7 @@
# Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
# Copyright (C) 2010 Marc-Andre Lureau <marcandre.lureau at redhat.com>
#
-# 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 0af04ceb..7005c2f3 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 <crobinso at redhat.com>
#
-# 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 9958d883..c354dd06 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 e6a8d2a1..0fb2f0e8 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 a0a94feb..e1243c2f 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 a6678452..c0449f63 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 a79dc7e2..3cd9319b 100644
--- a/virtconv/ovf.py
+++ b/virtconv/ovf.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 f93978f9..97e06795 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 bda92bbe..1a88af72 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 8c6e1fcd..ec90f797 100644
--- a/virtinst/capabilities.py
+++ b/virtinst/capabilities.py
@@ -4,7 +4,7 @@
# Copyright 2007, 2012-2014 Red Hat, Inc.
# Mark McLoughlin <markmc at redhat.com>
#
-# 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 e697a3da..05393e58 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -4,7 +4,7 @@
# Copyright 2006-2007, 2013, 2014 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 0fb02034..c510c6e3 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 0e195002..3ae35aa6 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 268b5ef0..6da0766d 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 ff16a5f3..3f364d76 100644
--- a/virtinst/devices/char.py
+++ b/virtinst/devices/char.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 6596a642..3b2f73a3 100644
--- a/virtinst/devices/controller.py
+++ b/virtinst/devices/controller.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013, 2014 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 72eded39..32fab455 100644
--- a/virtinst/devices/device.py
+++ b/virtinst/devices/device.py
@@ -4,7 +4,7 @@
# Copyright 2008, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 6ba66036..e104c06c 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 <katzj at redhat.com>
#
-# 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 a64f43ac..f00f1d91 100644
--- a/virtinst/devices/filesystem.py
+++ b/virtinst/devices/filesystem.py
@@ -2,7 +2,7 @@
# Copyright 2011, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 1dda935c..839ece9e 100644
--- a/virtinst/devices/graphics.py
+++ b/virtinst/devices/graphics.py
@@ -2,7 +2,7 @@
# Copyright 2006-2009, 2013 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 0c638095..9dee3111 100644
--- a/virtinst/devices/hostdev.py
+++ b/virtinst/devices/hostdev.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 da440845..9962f9a3 100644
--- a/virtinst/devices/input.py
+++ b/virtinst/devices/input.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 8762af73..06260352 100644
--- a/virtinst/devices/interface.py
+++ b/virtinst/devices/interface.py
@@ -2,7 +2,7 @@
# Copyright 2006-2009, 2013 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 7c063688..63c0e441 100644
--- a/virtinst/devices/memballoon.py
+++ b/virtinst/devices/memballoon.py
@@ -3,7 +3,7 @@
# Copyright 2012
# Eiichi Tsukata <devel at etsukata.com>
#
-# 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 5246216b..3c9a6a1a 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 ca3623fd..ecb8111e 100644
--- a/virtinst/devices/panic.py
+++ b/virtinst/devices/panic.py
@@ -2,7 +2,7 @@
# Copyright 2013 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 c3ca04c5..01bc5096 100644
--- a/virtinst/devices/redirdev.py
+++ b/virtinst/devices/redirdev.py
@@ -3,7 +3,7 @@
# Cole Robinson <crobinso at redhat.com>
# Marc-Andre Lureau <marcandre.lureau at redhat.com>
#
-# 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 518d50fe..18400304 100644
--- a/virtinst/devices/rng.py
+++ b/virtinst/devices/rng.py
@@ -2,7 +2,7 @@
# Copyright 2013 Red Hat, Inc.
# Giuseppe Scrivano <gscrivan at redhat.com>
#
-# 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 0d7597bf..499ef749 100644
--- a/virtinst/devices/smartcard.py
+++ b/virtinst/devices/smartcard.py
@@ -3,7 +3,7 @@
# Cole Robinson <crobinso at redhat.com>
# Marc-Andre Lureau <marcandre.lureau at redhat.com>
#
-# 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 2ef0b297..e5ea6d21 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 <crobinso at redhat.com>
#
-# 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 1161e93b..a09b08e1 100644
--- a/virtinst/devices/tpm.py
+++ b/virtinst/devices/tpm.py
@@ -6,7 +6,7 @@
# Copyright 2013 IBM Corporation
# Author: Stefan Berger <stefanb at linux.vnet.ibm.com>
#
-# 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 c01349e5..2b1d5134 100644
--- a/virtinst/devices/video.py
+++ b/virtinst/devices/video.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 efa97798..5fbdaeaf 100644
--- a/virtinst/devices/watchdog.py
+++ b/virtinst/devices/watchdog.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 f04bb870..56ab8761 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 8811971c..17b4a2bc 100644
--- a/virtinst/distroinstaller.py
+++ b/virtinst/distroinstaller.py
@@ -2,7 +2,7 @@
# Copyright 2006-2009, 2013, 2014 Red Hat, Inc.
# Daniel P. Berrange <berrange at redhat.com>
#
-# 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 702e92b6..992260fd 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 a8a40bf6..217c2c6a 100644
--- a/virtinst/domain/blkiotune.py
+++ b/virtinst/domain/blkiotune.py
@@ -2,7 +2,7 @@
# Copyright 2014 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 a9574c57..d7fc7f38 100644
--- a/virtinst/domain/clock.py
+++ b/virtinst/domain/clock.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 3c1089c0..ff18efb1 100644
--- a/virtinst/domain/cpu.py
+++ b/virtinst/domain/cpu.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 eb3bd862..67a76476 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 3da223c5..6f0eaa4e 100644
--- a/virtinst/domain/features.py
+++ b/virtinst/domain/features.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 f64e41cb..24973f18 100644
--- a/virtinst/domain/idmap.py
+++ b/virtinst/domain/idmap.py
@@ -2,7 +2,7 @@
# Copyright 2014 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 8a3f8a47..cef95337 100644
--- a/virtinst/domain/memorybacking.py
+++ b/virtinst/domain/memorybacking.py
@@ -2,7 +2,7 @@
# Copyright 2014 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 5d74ad9f..3d8fde3c 100644
--- a/virtinst/domain/memtune.py
+++ b/virtinst/domain/memtune.py
@@ -2,7 +2,7 @@
# Copyright 2014 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 1d075c18..6d65ee7a 100644
--- a/virtinst/domain/numatune.py
+++ b/virtinst/domain/numatune.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 ac468ca1..2bc12f70 100644
--- a/virtinst/domain/os.py
+++ b/virtinst/domain/os.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 fade0001..51344207 100644
--- a/virtinst/domain/pm.py
+++ b/virtinst/domain/pm.py
@@ -2,7 +2,7 @@
# Copyright 2014 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 673374d1..d0962db9 100644
--- a/virtinst/domain/resource.py
+++ b/virtinst/domain/resource.py
@@ -2,7 +2,7 @@
# Copyright 2014 Fujitsu Limited.
# Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
#
-# 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 ee0e1393..dad9c0eb 100644
--- a/virtinst/domain/seclabel.py
+++ b/virtinst/domain/seclabel.py
@@ -2,7 +2,7 @@
# Copyright 2010, 2012-2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 2b6e0260..215df046 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 <carnold suse com>
#
-# 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 5b39a759..c63a6481 100644
--- a/virtinst/domain/xmlnsqemu.py
+++ b/virtinst/domain/xmlnsqemu.py
@@ -1,7 +1,7 @@
# Copyright 2017 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 84b8e432..5ea94948 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 563203b4..b28d2e83 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -4,7 +4,7 @@
# Copyright 2006-2009, 2013, 2014, 2015 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 63b42da9..416d7494 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 30ad3f38..55898df2 100644
--- a/virtinst/initrdinject.py
+++ b/virtinst/initrdinject.py
@@ -2,7 +2,7 @@
# Copyright 2006-2009, 2013, 2014 Red Hat, Inc.
# Daniel P. Berrange <berrange at redhat.com>
#
-# 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 ec878385..0a89cf5a 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -4,7 +4,7 @@
# Copyright 2006-2009, 2013 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 caa2546b..623f7870 100644
--- a/virtinst/interface.py
+++ b/virtinst/interface.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 6b9f030f..e6e500be 100644
--- a/virtinst/kernelupload.py
+++ b/virtinst/kernelupload.py
@@ -2,7 +2,7 @@
# Copyright 2006-2009, 2013, 2014 Red Hat, Inc.
# Daniel P. Berrange <berrange at redhat.com>
#
-# 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 91b23347..5703b6e8 100644
--- a/virtinst/network.py
+++ b/virtinst/network.py
@@ -2,7 +2,7 @@
# Copyright 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 <network> XML
diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py
index a55a7f96..ec92b366 100644
--- a/virtinst/nodedev.py
+++ b/virtinst/nodedev.py
@@ -2,7 +2,7 @@
# Copyright 2009, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 314d104e..425557c8 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -4,7 +4,7 @@
# Copyright 2006-2008, 2013-2014 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 b16d84cc..37087abd 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 967d8764..9e5f918c 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 c11cde2a..5e2b94a4 100644
--- a/virtinst/snapshot.py
+++ b/virtinst/snapshot.py
@@ -2,7 +2,7 @@
# Copyright 2013-2014 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 656ab9e7..3a46d42c 100644
--- a/virtinst/storage.py
+++ b/virtinst/storage.py
@@ -2,7 +2,7 @@
# Copyright 2008, 2013, 2015 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 a8ec76db..e5bb4fdb 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -4,7 +4,7 @@
# Copyright 2009, 2013, 2014 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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 2aaa55af..930940f2 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 9d88754e..39655d92 100644
--- a/virtinst/urldetect.py
+++ b/virtinst/urldetect.py
@@ -2,7 +2,7 @@
# Copyright 2006-2007, 2013 Red Hat, Inc.
# Daniel P. Berrange <berrange at redhat.com>
#
-# 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 c60f8abb..fe410805 100644
--- a/virtinst/urlfetcher.py
+++ b/virtinst/urlfetcher.py
@@ -2,7 +2,7 @@
# Copyright 2006-2007, 2013 Red Hat, Inc.
# Daniel P. Berrange <berrange at redhat.com>
#
-# 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 b47d3143..8233a866 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -2,7 +2,7 @@
# Copyright 2006, 2013 Red Hat, Inc.
# Jeremy Katz <katzj at redhat.com>
#
-# 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 0e413f6c..44993ce3 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 506d9b76..e5eaa6ca 100644
--- a/virtinst/xmlbuilder.py
+++ b/virtinst/xmlbuilder.py
@@ -4,7 +4,7 @@
# Copyright 2008, 2013 Red Hat, Inc.
# Cole Robinson <crobinso at redhat.com>
#
-# 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
--
2.14.3
More information about the virt-tools-list
mailing list