Rectify mistake that was allowing for GPLv3.

The code was always intended to be released under GPLv2 license, not GPLv3.
Removed the obscure part about GPL license version,
and make explicit statement to release under GPLv2.

Change-Id: I16c90f45d111675799fb38da76b6079664ff2062

diff --git a/common/__init__.py b/common/__init__.py
index 74d7ca3..d53eeae 100644 (file)
--- a/common/__init__.py
+++ b/common/__init__.py
@@ -2,8 +2,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/backenddb.py b/common/backenddb.py
index f6f5300..6e3ad85 100644 (file)
--- a/common/backenddb.py
+++ b/common/backenddb.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation;version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/builddata.py b/common/builddata.py
index b9c3817..dd49c80 100644 (file)
--- a/common/builddata.py
+++ b/common/builddata.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/buildservice.py b/common/buildservice.py
index 98c697b..d2cdf68 100644 (file)
--- a/common/buildservice.py
+++ b/common/buildservice.py
@@ -6,8 +6,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/buildtrigger.py b/common/buildtrigger.py
index 4481414..f530e40 100644 (file)
--- a/common/buildtrigger.py
+++ b/common/buildtrigger.py
@@ -2,8 +2,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/gerrit.py b/common/gerrit.py
index 742da6e..6e0f227 100644 (file)
--- a/common/gerrit.py
+++ b/common/gerrit.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/git.py b/common/git.py
index ebe9b56..7f0d19e 100644 (file)
--- a/common/git.py
+++ b/common/git.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/imagedata.py b/common/imagedata.py
index 7322942..b5d1460 100644 (file)
--- a/common/imagedata.py
+++ b/common/imagedata.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/iris_rest_client.py b/common/iris_rest_client.py
index c746178..92ad810 100644 (file)
--- a/common/iris_rest_client.py
+++ b/common/iris_rest_client.py
@@ -3,8 +3,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/manifest.py b/common/manifest.py
index 9922805..a2fdc69 100644 (file)
--- a/common/manifest.py
+++ b/common/manifest.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/mapping.py b/common/mapping.py
index 92c4827..31905a6 100644 (file)
--- a/common/mapping.py
+++ b/common/mapping.py
@@ -3,8 +3,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/obspkg.py b/common/obspkg.py
index 5d448c6..a120284 100644 (file)
--- a/common/obspkg.py
+++ b/common/obspkg.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/prerelease.py b/common/prerelease.py
index 5689eb3..8550862 100644 (file)
--- a/common/prerelease.py
+++ b/common/prerelease.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/repomaker.py b/common/repomaker.py
index 69bcc87..a9bc08a 100644 (file)
--- a/common/repomaker.py
+++ b/common/repomaker.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/runner.py b/common/runner.py
index 222e8e7..e51f74a 100644 (file)
--- a/common/runner.py
+++ b/common/runner.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/send_mail.py b/common/send_mail.py
index 46af2f8..09f6d50 100644 (file)
--- a/common/send_mail.py
+++ b/common/send_mail.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/snapshot.py b/common/snapshot.py
index ff23a16..5e00013 100644 (file)
--- a/common/snapshot.py
+++ b/common/snapshot.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/tempbuildpkg.py b/common/tempbuildpkg.py
index 82c4ca3..6472af4 100644 (file)
--- a/common/tempbuildpkg.py
+++ b/common/tempbuildpkg.py
@@ -3,8 +3,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/upload_service.py b/common/upload_service.py
index b9ad379..5f7521b 100644 (file)
--- a/common/upload_service.py
+++ b/common/upload_service.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/common/utils.py b/common/utils.py
index f48ecd1..d62a141 100644 (file)
--- a/common/utils.py
+++ b/common/utils.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_buildlogs.py b/job_buildlogs.py
index 741c3b6..eb114ec 100755 (executable)
--- a/job_buildlogs.py
+++ b/job_buildlogs.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_create_snapshot.py b/job_create_snapshot.py
index 4d657c3..75ec2d6 100755 (executable)
--- a/job_create_snapshot.py
+++ b/job_create_snapshot.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_imager.py b/job_imager.py
index 03defe5..468153d 100755 (executable)
--- a/job_imager.py
+++ b/job_imager.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_jobs_dispatcher.py b/job_jobs_dispatcher.py
index 2c440cb..69f2571 100755 (executable)
--- a/job_jobs_dispatcher.py
+++ b/job_jobs_dispatcher.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_load_repos.yaml.py b/job_load_repos.yaml.py
index 8a564a8..ee82b6a 100755 (executable)
--- a/job_load_repos.yaml.py
+++ b/job_load_repos.yaml.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_local_cache_cleanups.py b/job_local_cache_cleanups.py
index 5e22e51..72f216a 100755 (executable)
--- a/job_local_cache_cleanups.py
+++ b/job_local_cache_cleanups.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_mail_sender.py b/job_mail_sender.py
index dcca604..f3f1adf 100755 (executable)
--- a/job_mail_sender.py
+++ b/job_mail_sender.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_monitor_scm_meta_git.py b/job_monitor_scm_meta_git.py
index 6e9e114..9f667e0 100755 (executable)
--- a/job_monitor_scm_meta_git.py
+++ b/job_monitor_scm_meta_git.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_post_image.py b/job_post_image.py
index a4af185..bde4f6c 100755 (executable)
--- a/job_post_image.py
+++ b/job_post_image.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index bcd76dc..5b6a862 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_publish_test_results.py b/job_publish_test_results.py
index 72b887c..25f8117 100755 (executable)
--- a/job_publish_test_results.py
+++ b/job_publish_test_results.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_re.py b/job_re.py
index eccac9d..adba1bb 100755 (executable)
--- a/job_re.py
+++ b/job_re.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_release_snapshot.py b/job_release_snapshot.py
index f9ea210..ce34424 100755 (executable)
--- a/job_release_snapshot.py
+++ b/job_release_snapshot.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_request.py b/job_request.py
index 184d7c6..8a3684b 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_rpm_buildlogs.py b/job_rpm_buildlogs.py
index 3ec15f1..58f0846 100755 (executable)
--- a/job_rpm_buildlogs.py
+++ b/job_rpm_buildlogs.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_submit.py b/job_submit.py
index bd200ab..ad673b9 100755 (executable)
--- a/job_submit.py
+++ b/job_submit.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_submitobs.py b/job_submitobs.py
index ca54148..b6e0e08 100755 (executable)
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_sync_obs.py b/job_sync_obs.py
index 23d9a8d..0d0a880 100755 (executable)
--- a/job_sync_obs.py
+++ b/job_sync_obs.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_sync_snapdiff.py b/job_sync_snapdiff.py
index a9447e4..aed7764 100755 (executable)
--- a/job_sync_snapdiff.py
+++ b/job_sync_snapdiff.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_test_build.py b/job_test_build.py
index 5d53f46..9b8c2f7 100755 (executable)
--- a/job_test_build.py
+++ b/job_test_build.py
@@ -4,8 +4,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/job_update_local_git.py b/job_update_local_git.py
index e8a50ad..cc77485 100755 (executable)
--- a/job_update_local_git.py
+++ b/job_update_local_git.py
@@ -5,8 +5,8 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2
+#    of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/obs_requests/__init__.py b/obs_requests/__init__.py
index ab72d2f..61d8808 100644 (file)
--- a/obs_requests/__init__.py
+++ b/obs_requests/__init__.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/obs_requests/mailer.py b/obs_requests/mailer.py
index aa1d563..33866b5 100644 (file)
--- a/obs_requests/mailer.py
+++ b/obs_requests/mailer.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_backenddb.py b/tests/test_backenddb.py
index 8e4c537..2e0a820 100644 (file)
--- a/tests/test_backenddb.py
+++ b/tests/test_backenddb.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_builddata.py b/tests/test_builddata.py
index 541d5fe..7e3000b 100644 (file)
--- a/tests/test_builddata.py
+++ b/tests/test_builddata.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_gbpgit.py b/tests/test_gbpgit.py
index 4b6725b..2c6e20b 100644 (file)
--- a/tests/test_gbpgit.py
+++ b/tests/test_gbpgit.py
@@ -7,8 +7,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_imagedata.py b/tests/test_imagedata.py
index 5989a50..af6c236 100644 (file)
--- a/tests/test_imagedata.py
+++ b/tests/test_imagedata.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_iris_rest_client.py b/tests/test_iris_rest_client.py
index 043dc73..c26b0e3 100644 (file)
--- a/tests/test_iris_rest_client.py
+++ b/tests/test_iris_rest_client.py
@@ -4,8 +4,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tests/test_repomaker.py b/tests/test_repomaker.py
index 19be46f..1384ec0 100644 (file)
--- a/tests/test_repomaker.py
+++ b/tests/test_repomaker.py
@@ -5,8 +5,7 @@
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU General Public License
-#    as published by the Free Software Foundation; either version 2
-#    of the License, or (at your option) any later version.
+#    as published by the Free Software Foundation; version 2 of the License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of