diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-03-16 16:30:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@baserock.org> | 2015-03-16 16:30:05 +0000 |
commit | db23e8e6406f98722d2d18bf61b8e85cd99415eb (patch) | |
tree | 94cb9880f6a6183bac9ec2c89102ddfa8c51f926 /distbuild | |
parent | 093bdfa2b2678bdb5c7d949d819b082827198377 (diff) | |
parent | 51592df98704e75216c5d27ae850e5b391675d76 (diff) | |
download | morph-db23e8e6406f98722d2d18bf61b8e85cd99415eb.tar.gz |
Merge "Use the modern way of the GPL copyright header: URL instead real address"
Diffstat (limited to 'distbuild')
29 files changed, 51 insertions, 80 deletions
diff --git a/distbuild/__init__.py b/distbuild/__init__.py index 62a904d4..fc74d480 100644 --- a/distbuild/__init__.py +++ b/distbuild/__init__.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. from stringbuffer import StringBuffer diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py index fd4b2105..83e44f89 100644 --- a/distbuild/build_controller.py +++ b/distbuild/build_controller.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/connection_machine.py b/distbuild/connection_machine.py index e75ebe56..b17a0e1d 100644 --- a/distbuild/connection_machine.py +++ b/distbuild/connection_machine.py @@ -1,6 +1,6 @@ # distbuild/connection_machine.py -- state machine for connecting to server # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import errno diff --git a/distbuild/crashpoint.py b/distbuild/crashpoint.py index 6e3eb3ef..98e6906c 100644 --- a/distbuild/crashpoint.py +++ b/distbuild/crashpoint.py @@ -1,6 +1,6 @@ # distbuild/crashpoint.py -- user-controlled crashing # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. '''Crash the application. diff --git a/distbuild/crashpoint_tests.py b/distbuild/crashpoint_tests.py index eb64115e..be073a96 100644 --- a/distbuild/crashpoint_tests.py +++ b/distbuild/crashpoint_tests.py @@ -1,6 +1,6 @@ # distbuild/crashpoint_tests.py -- unit tests for crashpoint.py # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import unittest diff --git a/distbuild/distbuild_socket.py b/distbuild/distbuild_socket.py index ce69f29e..2e219bb3 100644 --- a/distbuild/distbuild_socket.py +++ b/distbuild/distbuild_socket.py @@ -1,6 +1,6 @@ # distbuild/distbuild_socket.py -- wrapper around Python 'socket' module. # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import socket diff --git a/distbuild/eventsrc.py b/distbuild/eventsrc.py index 560b9b7a..85e4f5f9 100644 --- a/distbuild/eventsrc.py +++ b/distbuild/eventsrc.py @@ -1,6 +1,6 @@ # mainloop/eventsrc.py -- interface for event sources # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. class EventSource(object): diff --git a/distbuild/helper_router.py b/distbuild/helper_router.py index f7126093..5578f750 100644 --- a/distbuild/helper_router.py +++ b/distbuild/helper_router.py @@ -1,6 +1,6 @@ # distbuild/helper_router.py -- state machine for controller's helper comms # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/idgen.py b/distbuild/idgen.py index 41f2ffcf..ef5684d7 100644 --- a/distbuild/idgen.py +++ b/distbuild/idgen.py @@ -1,6 +1,6 @@ # distbuild/idgen.py -- generate unique identifiers # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/initiator.py b/distbuild/initiator.py index 549df66b..eef4c9ec 100644 --- a/distbuild/initiator.py +++ b/distbuild/initiator.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import cliapp diff --git a/distbuild/initiator_connection.py b/distbuild/initiator_connection.py index e0ab047a..8d6c1f4c 100644 --- a/distbuild/initiator_connection.py +++ b/distbuild/initiator_connection.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/jm.py b/distbuild/jm.py index 85510924..c08a1958 100644 --- a/distbuild/jm.py +++ b/distbuild/jm.py @@ -1,6 +1,6 @@ # mainloop/jm.py -- state machine for JSON communication between nodes # -# Copyright (C) 2012, 2014 - 2015 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import fcntl diff --git a/distbuild/json_router.py b/distbuild/json_router.py index 8b7b6457..b8d0ca55 100644 --- a/distbuild/json_router.py +++ b/distbuild/json_router.py @@ -1,6 +1,6 @@ # distbuild/json_router.py -- state machine to route JSON messages # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/mainloop.py b/distbuild/mainloop.py index f15a3ac1..e7c0cc3b 100644 --- a/distbuild/mainloop.py +++ b/distbuild/mainloop.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import fcntl diff --git a/distbuild/protocol.py b/distbuild/protocol.py index 141df742..73d72d1d 100644 --- a/distbuild/protocol.py +++ b/distbuild/protocol.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. '''Construct protocol message objects (dicts).''' diff --git a/distbuild/proxy_event_source.py b/distbuild/proxy_event_source.py index 20080800..4f75819a 100644 --- a/distbuild/proxy_event_source.py +++ b/distbuild/proxy_event_source.py @@ -1,6 +1,6 @@ # distbuild/proxy_event_source.py -- proxy for temporary event sources # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import errno diff --git a/distbuild/route_map.py b/distbuild/route_map.py index 6dd90d78..0d482e24 100644 --- a/distbuild/route_map.py +++ b/distbuild/route_map.py @@ -1,6 +1,6 @@ # distbuild/route_map.py -- map message ids for routing purposes # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. class RouteMap(object): diff --git a/distbuild/route_map_tests.py b/distbuild/route_map_tests.py index b5ceca70..1f6cee5e 100644 --- a/distbuild/route_map_tests.py +++ b/distbuild/route_map_tests.py @@ -1,6 +1,6 @@ # distbuild/route_map_tests.py -- unit tests for message routing # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import unittest diff --git a/distbuild/serialise.py b/distbuild/serialise.py index a7c6c4b9..3e39e684 100644 --- a/distbuild/serialise.py +++ b/distbuild/serialise.py @@ -1,6 +1,6 @@ # distbuild/serialise.py -- (de)serialise Artifact object graphs # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import json diff --git a/distbuild/serialise_tests.py b/distbuild/serialise_tests.py index d80c3dd7..a0ad78f8 100644 --- a/distbuild/serialise_tests.py +++ b/distbuild/serialise_tests.py @@ -1,6 +1,6 @@ # distbuild/serialise_tests.py -- unit tests for Artifact serialisation # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import unittest diff --git a/distbuild/sm.py b/distbuild/sm.py index e773962b..fd1d04ac 100644 --- a/distbuild/sm.py +++ b/distbuild/sm.py @@ -1,6 +1,6 @@ # mainloop/sm.py -- state machine abstraction # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/sm_tests.py b/distbuild/sm_tests.py index 59b9c023..e1f3be9f 100644 --- a/distbuild/sm_tests.py +++ b/distbuild/sm_tests.py @@ -1,6 +1,6 @@ # distbuild/sm_tests.py -- unit tests for state machine abstraction # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import unittest diff --git a/distbuild/sockbuf.py b/distbuild/sockbuf.py index fc0315b0..1cb524a5 100644 --- a/distbuild/sockbuf.py +++ b/distbuild/sockbuf.py @@ -1,6 +1,6 @@ # mainloop/sockbuf.py -- a buffering, non-blocking socket I/O state machine # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/socketsrc.py b/distbuild/socketsrc.py index 15283140..b2a21a16 100644 --- a/distbuild/socketsrc.py +++ b/distbuild/socketsrc.py @@ -1,6 +1,6 @@ # mainloop/socketsrc.py -- events and event sources for sockets # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import fcntl diff --git a/distbuild/sockserv.py b/distbuild/sockserv.py index 156394e2..c9979328 100644 --- a/distbuild/sockserv.py +++ b/distbuild/sockserv.py @@ -1,6 +1,6 @@ # mainloop/sockserv.py -- socket server state machines # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import logging diff --git a/distbuild/stringbuffer.py b/distbuild/stringbuffer.py index 2b94dd19..6371c841 100644 --- a/distbuild/stringbuffer.py +++ b/distbuild/stringbuffer.py @@ -1,6 +1,6 @@ # mainloop/stringbuffer.py -- efficient buffering of strings as a queue # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. class StringBuffer(object): diff --git a/distbuild/stringbuffer_tests.py b/distbuild/stringbuffer_tests.py index da324f20..5df8951a 100644 --- a/distbuild/stringbuffer_tests.py +++ b/distbuild/stringbuffer_tests.py @@ -1,6 +1,6 @@ # distbuild/stringbuffer_tests.py -- unit tests # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import unittest diff --git a/distbuild/timer_event_source.py b/distbuild/timer_event_source.py index 4a2e81b7..5f5eeb1c 100644 --- a/distbuild/timer_event_source.py +++ b/distbuild/timer_event_source.py @@ -1,6 +1,6 @@ # distbuild/timer_event_source.py -- event source for timer events # -# Copyright (C) 2012, 2014 Codethink Limited +# Copyright (C) 2012, 2014-2015 Codethink Limited # # 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 @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import time diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 81c961e1..e58059b2 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -12,8 +12,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.. +# with this program. If not, see <http://www.gnu.org/licenses/>. import collections |