Merge lp:~adam-collard/landscape-client/drop-dbus into lp:~landscape/landscape-client/trunk

[Adam Collard]

Remove dead dbus code and textmessage (confirmed not supported in server for ~2 years).

Drive-by fixes for lintian complaints.

Remove dead dbus code and textmessage (confirmed not supported in server for ~2 years).

Drive-by fixes for lintian complaints.

Testing instructions:
 * make check
 * make package
 * Install package locally, confirm server integration tests pass

[lp:~adam-collard/landscape-client/drop-dbus]

928. By Adam Collard on 2017-01-18

Merge from trunk

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 928
Branch: lp:~adam-collard/landscape-client/drop-dbus
Jenkins: https://ci.lscape.net/job/latch-test-precise/855/

review: Approve (test results)

[Alberto Donato (ack)]

+1

One nit inline

review: Approve

[Free Ekanayaka (free.ekanayaka)]

I can't see anything harmful, so KIWF! +1

review: Approve

[lp:~adam-collard/landscape-client/drop-dbus]

929. By Adam Collard on 2017-01-18

Drop unnecesary variable for use_dhpython2 since we always use it.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 929
Branch: lp:~adam-collard/landscape-client/drop-dbus
Jenkins: https://ci.lscape.net/job/latch-test-precise/856/

review: Approve (test results)

=== modified file 'Makefile'
--- Makefile	2016-06-17 00:17:50 +0000
+++ Makefile	2017-01-18 09:59:00 +0000
@@ -23,12 +23,6 @@
 	$(PYTHON) setup.py build_ext -i
 
 check: build
-	@if [ -z "$$DBUS_SESSION_BUS_ADDRESS" ]; then \
-		OUTPUT=`dbus-daemon --print-address=1 --print-pid=1 --session --fork`; \
-		export DBUS_SESSION_BUS_ADDRESS=`echo $$OUTPUT | cut -f1 -d ' '`; \
-		DBUS_PID=`echo $$OUTPUT | cut -f2 -d ' '`; \
-		trap "kill $$DBUS_PID" EXIT; \
-	fi; \
 	if [ -z "$$DISPLAY" ]; then \
 		xvfb-run $(TEST_COMMAND); \
 	else \
@@ -60,7 +54,6 @@
 manpages:
 	LC_ALL=C ${TXT2MAN} -P Landscape -s 1 -t landscape-client < man/landscape-client.txt > man/landscape-client.1
 	LC_ALL=C ${TXT2MAN} -P Landscape -s 1 -t landscape-config < man/landscape-config.txt > man/landscape-config.1
-	LC_ALL=C ${TXT2MAN} -P Landscape -s 1 -t landscape-message < man/landscape-message.txt > man/landscape-message.1
 	LC_ALL=C ${TXT2MAN} -P Landscape -s 1 -t landscape-sysinfo < man/landscape-sysinfo.txt > man/landscape-sysinfo.1
 
 origtarball: sdist

=== modified file 'README'
--- README	2012-03-05 14:11:42 +0000
+++ README	2017-01-18 09:59:00 +0000
@@ -23,13 +23,9 @@
 
 == Developing ==
 
-To run the full test suite, you must have a dbus session bus
-running. If you don't have one (for example, if you're running the
-tests in an ssh session), run the following command:
-
-export DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --print-address=1 --session --fork`
-
-Then your tests should pass.
+To run the full test suite, run the following command:
+
+make check
 
 When you want to test the landscape client manually without management
 features, you can simply run:

=== removed directory 'dbus-1'
=== removed file 'dbus-1/landscape.conf'
--- dbus-1/landscape.conf	2013-05-20 07:28:42 +0000
+++ dbus-1/landscape.conf	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <policy user="landscape">
-    <allow own="com.canonical.landscape.Broker" />
-    <allow own="com.canonical.landscape.Monitor" />
-
-    <allow send_destination="com.canonical.landscape.Broker" />
-    <allow receive_sender="com.canonical.landscape.Broker" />
-
-    <allow send_destination="com.canonical.landscape.Monitor" />
-    <allow receive_sender="com.canonical.landscape.Monitor" />
-
-    <allow send_destination="com.canonical.landscape.Manager" />
-    <allow receive_sender="com.canonical.landscape.Manager" />
-
-  </policy>
-
-  <policy user="root">
-    <allow own="com.canonical.landscape.Manager" />
-
-    <allow send_destination="com.canonical.landscape.Broker" />
-    <allow receive_sender="com.canonical.landscape.Broker" />
-
-    <allow send_destination="com.canonical.landscape.Monitor" />
-    <allow receive_sender="com.canonical.landscape.Monitor" />
-
-    <allow send_destination="com.canonical.landscape.Manager" />
-    <allow receive_sender="com.canonical.landscape.Manager" />
-  </policy>
-
-  <policy context="default">
-    <deny own="com.canonical.landscape.Broker" />
-    <deny own="com.canonical.landscape.Monitor" />
-    <deny own="com.canonical.landscape.Manager" />
-
-    <deny send_destination="com.canonical.landscape.Broker" />
-    <deny receive_sender="com.canonical.landscape.Broker" />
-
-    <deny send_destination="com.canonical.landscape.Monitor" />
-    <deny receive_sender="com.canonical.landscape.Monitor" />
-
-    <deny send_destination="com.canonical.landscape.Manager" />
-    <deny receive_sender="com.canonical.landscape.Manager" />
-
-  </policy>
-
-</busconfig>

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-20 17:31:16 +0000
+++ debian/changelog	2017-01-18 09:59:00 +0000
@@ -1,3 +1,9 @@
+landscape-client (16.08+bzr925-0ubuntu0) xenial; urgency=medium
+
+  * New local test build
+
+ -- Adam Collard <[e-mail]>  Wed, 18 Jan 2017 09:11:33 +0000
+
 landscape-client (16.08-0ubuntu1) UNRELEASED; urgency=medium
 
   * New trunk build

=== modified file 'debian/control'
--- debian/control	2016-03-23 08:14:06 +0000
+++ debian/control	2017-01-18 09:59:00 +0000
@@ -25,7 +25,7 @@
 Suggests: ${extra:Suggests}
 Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
 Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
-Description: The Landscape administration system client - Common files
+Description: Landscape administration system client - Common files
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
  Landscape account.
@@ -41,7 +41,7 @@
          python-pycurl,
          landscape-common (= ${binary:Version})
 Suggests: ${extra:Suggests}
-Description: The Landscape administration system client
+Description: Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
  Landscape account.

=== modified file 'debian/landscape-client.install'
--- debian/landscape-client.install	2016-01-07 10:45:00 +0000
+++ debian/landscape-client.install	2017-01-18 09:59:00 +0000
@@ -2,11 +2,8 @@
 usr/bin/landscape-client
 usr/bin/landscape-config
 usr/bin/landscape-manager
-usr/bin/landscape-message
 usr/bin/landscape-monitor
 usr/bin/landscape-package-changer
 usr/bin/landscape-package-reporter
 usr/bin/landscape-release-upgrader
-usr/bin/landscape-dbus-proxy
 usr/lib/landscape
-etc/dbus-1/system.d/landscape.conf

=== modified file 'debian/landscape-client.manpages'
--- debian/landscape-client.manpages	2012-09-26 14:04:47 +0000
+++ debian/landscape-client.manpages	2017-01-18 09:59:00 +0000
@@ -1,3 +1,2 @@
 man/landscape-client.1
 man/landscape-config.1
-man/landscape-message.1

=== modified file 'debian/landscape-client.postinst' (properties changed: -x to +x)
--- debian/landscape-client.postinst	2016-08-15 15:22:40 +0000
+++ debian/landscape-client.postinst	2017-01-18 09:59:00 +0000
@@ -98,17 +98,6 @@
             dpkg-statoverride --update --add root landscape 4754 $apt_update
         fi
 
-        # Check if we're upgrading from a D-Bus version like the client in the
-        # lucid archives.
-        if ! [ -z $2 ]; then
-            if dpkg --compare-versions $2 lt 1.5.1; then
-                # Launch a proxy service that will forward requests over DBus
-                # from the old package-changer to the new AMP-based broker. This
-                # is a one-off only needed for the DBus->AMP upgrade
-                start-stop-daemon -x /usr/bin/landscape-dbus-proxy -b -c landscape -u landscape -S
-            fi
-         fi
-
         # In response to bug 1508110 we need to trigger a complete update of
         # user information.  The flag file will be removed by the client when
         # the update completes.

=== modified file 'debian/landscape-common.postinst' (properties changed: -x to +x)
--- debian/landscape-common.postinst	2016-09-16 09:58:18 +0000
+++ debian/landscape-common.postinst	2017-01-18 09:59:00 +0000
@@ -41,14 +41,14 @@
        if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
            rm -f $PROFILE_LOCATION 2>/dev/null || true
            ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
-           /usr/sbin/update-motd 2>/dev/null || true
+           update-motd 2>/dev/null || true
        elif [ "$RET" = "Run sysinfo on every login" ]; then
            rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           /usr/sbin/update-motd 2>/dev/null || true
+           update-motd 2>/dev/null || true
            ln -sf $WRAPPER $PROFILE_LOCATION
        else
            rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           /usr/sbin/update-motd 2>/dev/null || true
+           update-motd 2>/dev/null || true
            rm -f $PROFILE_LOCATION || true
        fi
 

=== modified file 'debian/landscape-common.prerm' (properties changed: -x to +x)
--- debian/landscape-common.prerm	2016-09-16 10:05:55 +0000
+++ debian/landscape-common.prerm	2017-01-18 09:59:00 +0000
@@ -21,7 +21,7 @@
     remove|upgrade|deconfigure)
        dpkg-divert --remove --package landscape-common --rename /etc/update-motd.d/90-updates-available
        rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
-       /usr/sbin/update-motd 2>/dev/null || true
+       update-motd 2>/dev/null || true
        rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
     ;;
 

=== modified file 'debian/rules'
--- debian/rules	2016-07-06 12:08:20 +0000
+++ debian/rules	2017-01-18 09:59:00 +0000
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
 
 dist_release := $(shell lsb_release -cs)
-ifneq ($(dist_release),dapper)
-	use_pycentral = yes
-endif
-ifeq (,$(filter $(dist_release), hardy lucid))
-	use_dhpython2 = yes
-endif
 
 dh_extra_flags = -plandscape-common -plandscape-client
 
@@ -92,19 +86,7 @@
 	echo "extra:Depends=libpam-systemd" >> $(landscape_client_substvars)
 endif
 
-ifeq ($(use_dhpython2),yes)
 	dh_python2 --no-guessing-versions
-else
-    ifeq ($(use_pycentral),yes)
-        ifneq (,$(py_setup_install_args))
-			DH_PYCENTRAL=include-links dh_pycentral
-        else
-			DH_PYCENTRAL=nomove dh_pycentral
-        endif
-    else
-		dh_python
-    endif
-endif
 	dh_installdeb $(dh_extra_flags)
 	dh_gencontrol $(dh_extra_flags)
 	dh_md5sums $(dh_extra_flags)

=== modified file 'debian/source.lintian-overrides'
--- debian/source.lintian-overrides	2012-05-28 19:45:04 +0000
+++ debian/source.lintian-overrides	2017-01-18 09:59:00 +0000
@@ -1,15 +1,4 @@
 # we use dh_python or dh_python2 depending on the ubuntu release
 # the package is being built on, this is detected dynamically
 # in the rules file
-landscape-client source: dh_python-is-obsolete
-
-# the package has to build on lucid, where the standards version
-# is 3.8.2
-landscape-client source: ancient-standards-version
-
-# it's a bug that should be fixed in quantal
-landscape-client source: unknown-field-in-dsc original-maintainer
-
-# this is only used in a very specific client upgrade from
-# the dbus to the amp version
-landscape-client: start-stop-daemon-in-maintainer-script postinst:130
+landscape-client source: dh_python-is-obsolete
\ No newline at end of file

=== modified file 'dev/run-piuparts'
--- dev/run-piuparts	2014-10-29 11:18:17 +0000
+++ dev/run-piuparts	2017-01-18 09:59:00 +0000
@@ -24,17 +24,6 @@
 }
 
 #
-# Check if X is running, if not abort because we would make X crash (D-Bus!)
-#
-if pidof X > /dev/null; then
-    cat <<EOF
-It appears you're running an X session. This script would kill your session
-due to landscape-client reloading dbus in its postinst script. Quitting now.
-EOF
-    exit 1
-fi
-
-#
 # Check we have piuparts >= 0.36
 #
 PIUPARTS_VERSION=$(sudo piuparts --version 2>/dev/null| cut -f 2 -d " ")
@@ -140,10 +129,7 @@
     -I "/var/lib/.*" \
     -I "/usr/lib/python2.6/dist-packages/twisted.*" \
     -i /etc/X11 \
-    -i /etc/dbus-1 \
-    -i /etc/dbus-1/system.d \
     -I "/usr/lib/python2.4/site-packages/apt.*" \
-    -I "/usr/lib/python2.4/site-packages/dbus.*" \
     -I "/usr/lib/python2.5/site-packages/twisted.*" \
     -b ${BASETGZ} \
     ${SOURCE}_${VERSION}_${ARCH}.changes

=== modified file 'landscape/broker/exchange.py'
--- landscape/broker/exchange.py	2015-01-12 09:27:02 +0000
+++ landscape/broker/exchange.py	2017-01-18 09:59:00 +0000
@@ -833,8 +833,7 @@
                 handler(message)
 
     def register_client_accepted_message_type(self, type):
-        # stringify the type because it's a dbus.String.  It should work
-        # anyway, but this is just for sanity and less confusing logs.
+        # stringify the type for sanity and less confusing logs.
         self._client_accepted_types.add(str(type))
 
     def get_client_accepted_message_types(self):

=== removed file 'landscape/lib/bpickle_dbus.py'
--- landscape/lib/bpickle_dbus.py	2012-03-06 09:17:51 +0000
+++ landscape/lib/bpickle_dbus.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-"""
-Different versions of the Python DBus bindings return different types
-to represent integers, strings, lists, etc.  Older versions return
-builtin Python types: C{int}, C{str}, C{list}, etc.  Newer versions
-return DBus-specific wrappers: C{Int16}, C{String}, C{Array}, etc.
-Failures occur when DBus types are used because bpickle doesn't know
-that an C{Int16} is really an C{int} and that an C{Array} is really a
-C{list}.
-
-L{install} and L{uninstall} can install and remove extensions that
-make bpickle work with DBus types.
-"""
-
-import dbus
-
-from landscape.lib import bpickle
-
-
-def install():
-    """Install bpickle extensions for DBus types."""
-    for type, function in get_dbus_types():
-        bpickle.dumps_table[type] = function
-
-
-def uninstall():
-    """Uninstall bpickle extensions for DBus types."""
-    for type, function in get_dbus_types():
-        del bpickle.dumps_table[type]
-
-
-def dumps_utf8string(obj):
-    """
-    Convert the specified L{dbus.types.UTF8String} to bpickle's
-    representation for C{unicode} data.
-    """
-    return "u%s:%s" % (len(obj), obj)
-
-
-def dumps_double(obj):
-    """
-    Convert a dbus.types.Double into a floating point representation.
-    """
-    return "f%r;" % float(obj)
-
-
-def get_dbus_types():
-    """
-    Generator yields C{(type, bpickle_function)} for available DBus
-    types.
-    """
-    for (type_name, function) in [("Boolean", bpickle.dumps_bool),
-                                  ("Int16", bpickle.dumps_int),
-                                  ("UInt16", bpickle.dumps_int),
-                                  ("Int32", bpickle.dumps_int),
-                                  ("UInt32", bpickle.dumps_int),
-                                  ("Int64", bpickle.dumps_int),
-                                  ("UInt64", bpickle.dumps_int),
-                                  ("Double", dumps_double),
-                                  ("Array", bpickle.dumps_list),
-                                  ("Dictionary", bpickle.dumps_dict),
-                                  ("String", bpickle.dumps_unicode),
-                                  ("UTF8String", dumps_utf8string)]:
-        type = getattr(dbus.types, type_name, None)
-        if type is not None:
-            yield type, function

=== modified file 'landscape/service.py'
--- landscape/service.py	2013-05-14 22:57:15 +0000
+++ landscape/service.py	2017-01-18 09:59:00 +0000
@@ -27,12 +27,6 @@
 
     def __init__(self, config):
         self.config = config
-        try:
-            from landscape.lib import bpickle_dbus
-        except ImportError:
-            pass
-        else:
-            bpickle_dbus.install()
         self.reactor = self.reactor_factory()
         if self.persist_filename:
             self.persist = get_versioned_persist(self)

=== modified file 'landscape/tests/test_service.py'
--- landscape/tests/test_service.py	2016-08-17 20:31:48 +0000
+++ landscape/tests/test_service.py	2017-01-18 09:59:00 +0000
@@ -1,6 +1,5 @@
 import logging
 import signal
-import mock
 
 from twisted.internet import reactor
 from twisted.internet.task import deferLater
@@ -53,14 +52,6 @@
         service = TestService(self.config)
         self.assertFalse(hasattr(service, "persist"))
 
-    @mock.patch("landscape.lib.bpickle_dbus.install")
-    def test_install_bpickle_dbus(self, mock_install):
-        """
-        A L{LandscapeService} installs the DBus extensions of bpickle.
-        """
-        TestService(self.config)
-        mock_install.assert_called_once_with()
-
     def test_usr1_rotates_logs(self):
         """
         SIGUSR1 should cause logs to be reopened.

=== removed file 'landscape/tests/test_textmessage.py'
--- landscape/tests/test_textmessage.py	2012-03-05 14:11:42 +0000
+++ landscape/tests/test_textmessage.py	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-import sys
-
-from landscape.textmessage import (
-    AcceptedTypeError, EmptyMessageError, got_accepted_types, get_message,
-    send_message)
-from landscape.tests.helpers import (
-    LandscapeTest, FakeBrokerServiceHelper, StandardIOHelper)
-
-
-class SendMessageTest(LandscapeTest):
-
-    helpers = [StandardIOHelper, FakeBrokerServiceHelper]
-
-    def test_send_message(self):
-        """
-        L{send_message} should send a message of type
-        C{text-message} to the landscape dbus messaging service.
-        """
-        service = self.broker_service
-        service.message_store.set_accepted_types(["text-message"])
-
-        result = send_message(u"Hi there!", self.remote)
-
-        def got_result(result):
-            messages = service.message_store.get_pending_messages()
-            self.assertEqual(len(messages), 1)
-            self.assertMessage(messages[0], {"type": "text-message",
-                                             "message": u"Hi there!"})
-            self.assertTrue(service.exchanger.is_urgent())
-        return result.addCallback(got_result)
-
-    def test_got_accepted_types_without_text_message_type(self):
-        """
-        If 'text-message' isn't in the list of accepted types an
-        L{AcceptedTypeError} is raised.
-        """
-        self.assertRaises(AcceptedTypeError, got_accepted_types, (),
-                          self.remote, ())
-
-    def test_got_accepted_types(self):
-        """
-        If 'text-message' is an accepted type a message should be
-        retrieved from the user and sent to the broker.
-        """
-        service = self.broker_service
-        service.message_store.set_accepted_types(["text-message"])
-
-        input = u"Foobl\N{HIRAGANA LETTER A}"
-        self.stdin.write(input.encode("UTF-8"))
-        self.stdin.seek(0, 0)
-
-        def got_result(result):
-            messages = service.message_store.get_pending_messages()
-            self.assertEqual(len(messages), 1)
-            self.assertMessage(messages[0],
-                               {"type": "text-message",
-                                "message": u"Foobl\N{HIRAGANA LETTER A}"})
-
-        d = got_accepted_types(["text-message"], self.remote, ())
-        d.addCallback(got_result)
-        return d
-
-
-class ScriptTest(LandscapeTest):
-
-    helpers = [StandardIOHelper]
-
-    def test_get_message(self):
-        """
-        A message should be properly decoded from the command line arguments.
-        """
-        message = get_message(
-            ["landscape-message",
-             u"\N{HIRAGANA LETTER A}".encode(sys.stdin.encoding), "a!"])
-        self.assertEqual(message, u"\N{HIRAGANA LETTER A} a!")
-
-    def test_get_message_stdin(self):
-        """
-        If no arguments are specified then the message should be read
-        from stdin.
-        """
-        input = u"Foobl\N{HIRAGANA LETTER A}"
-        self.stdin.write(input.encode("UTF-8"))
-        self.stdin.seek(0, 0)
-        message = get_message(["landscape-message"])
-        self.assertEqual(self.stdout.getvalue(),
-                         "Please enter your message, and send EOF "
-                         "(Control + D after newline) when done.\n")
-        self.assertEqual(message, input)
-
-    def test_get_empty_message_stdin(self):
-        """
-        If no arguments are specified then the message should be read
-        from stdin.
-        """
-        self.assertRaises(EmptyMessageError,
-                          get_message, ["landscape-message"])
-
-    def test_get_message_without_encoding(self):
-        """
-        If sys.stdin.encoding is None, it's likely a pipe, so try to
-        decode it as UTF-8 by default.
-        """
-        encoding = sys.stdin.encoding
-        sys.stdin.encoding = None
-        try:
-            message = get_message(
-                ["landscape-message",
-                 u"\N{HIRAGANA LETTER A}".encode("UTF-8"), "a!"])
-        finally:
-            sys.stdin.encoding = encoding
-        self.assertEqual(message, u"\N{HIRAGANA LETTER A} a!")

=== removed file 'landscape/textmessage.py'
--- landscape/textmessage.py	2013-05-21 08:37:08 +0000
+++ landscape/textmessage.py	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-"""
-Support code for the C{landscape-message} utility, which sends a text
-message to the Landscape web UI via the landscape-client's dbus
-messaging service (see L{landscape.plugins.dbus_message}).
-"""
-
-import sys
-
-from landscape.lib.log import log_failure
-from landscape.reactor import LandscapeReactor
-from landscape.broker.amp import RemoteBrokerConnector
-from landscape.deployment import Configuration
-
-
-class AcceptedTypeError(Exception):
-    """
-    Raised when a message is sent without 'text-message' being an
-    accepted type.
-    """
-
-
-class EmptyMessageError(Exception):
-    """Raised when an empty message is provied."""
-
-
-def send_message(text, broker):
-    """Add a message to the queue via a remote broker.
-
-    The message is of type C{text-message}.
-
-    @param broker: A connected L{RemoteBroker} object to use to send
-        the message.
-    @return: A L{Deferred} which will fire with the result of the send.
-    """
-    def got_session_id(session_id):
-        response = broker.send_message(message, session_id, True)
-        return response
-
-    message = {"type": "text-message", "message": text}
-    result = broker.get_session_id()
-    result.addCallback(got_session_id)
-    return result
-
-
-def got_result(result):
-    print u"Message sent."
-
-
-def get_message(args):
-    encoding = sys.stdin.encoding or "UTF-8"
-    if len(args) < 2:
-        print ("Please enter your message, and send EOF (Control + D after "
-               "newline) when done.")
-        message = sys.stdin.read().decode(encoding)
-    else:
-        message = u" ".join([x.decode(encoding) for x in args[1:]])
-    if not message:
-        raise EmptyMessageError("Text messages may not be empty.")
-    return message
-
-
-def got_accepted_types(accepted_types, broker, args):
-    if not "text-message" in accepted_types:
-        raise AcceptedTypeError("Text messages may not be created.  Is "
-                                "Landscape Client registered with the server?")
-    message = get_message(args)
-    d = send_message(message, broker)
-    d.addCallback(got_result)
-    return d
-
-
-def run(args=sys.argv):
-    """Send a message to Landscape.
-
-    This function runs a Twisted reactor, prints various status
-    messages, and exits the process.
-    """
-    reactor = LandscapeReactor()
-    config = Configuration()
-    config.load(args)
-
-    def got_connection(broker):
-        result = broker.get_accepted_message_types()
-        return result.addCallback(got_accepted_types, broker, args)
-
-    def got_error(failure):
-        log_failure(failure)
-
-    connector = RemoteBrokerConnector(reactor, config)
-    result = connector.connect()
-    result.addCallback(got_connection)
-    result.addErrback(got_error)
-    result.addBoth(lambda x: connector.disconnect())
-
-    # For some obscure reason our LandscapeReactor.stop method calls
-    # reactor.crash() instead of reactor.stop(), which doesn't work
-    # here. Maybe LandscapeReactor.stop should simply use reactor.stop().
-    result.addBoth(lambda ignored: reactor.call_later(
-        0, reactor._reactor.stop))
-
-    reactor.run()
-
-    return result

=== modified file 'landscape/watchdog.py'
--- landscape/watchdog.py	2014-07-10 19:16:56 +0000
+++ landscape/watchdog.py	2017-01-18 09:59:00 +0000
@@ -58,8 +58,6 @@
     @cvar program: The name of the executable program that will start this
         daemon.
     @cvar username: The name of the user to switch to, by default.
-    @cvar service: The DBus service name that the program will be expected to
-        listen on.
     @cvar max_retries: The maximum number of retries before giving up when
         trying to connect to the watched daemon.
     @cvar factor: The factor by which the delay between subsequent connection
@@ -184,7 +182,7 @@
     def is_running(self):
         # FIXME Error cases may not be handled in the best possible way
         # here. We're basically return False if any error happens from the
-        # dbus ping.
+        # AMP ping.
         return self._connect_and_call("ping")
 
     def wait(self):
@@ -375,7 +373,7 @@
     def start(self):
         """
         Start all daemons. The broker will be started first, and no other
-        daemons will be started before it is running and responding to DBUS
+        daemons will be started before it is running and responding to AMP
         messages.
 
         @return: A deferred which fires when all services have successfully

=== modified file 'man/landscape-client.1'
--- man/landscape-client.1	2014-07-10 19:16:56 +0000
+++ man/landscape-client.1	2017-01-18 09:59:00 +0000
@@ -1,5 +1,5 @@
-.\"Text automatically generated by txt2man
-.TH landscape-client 1 "10 July 2014" "" ""
+.\" Text automatically generated by txt2man
+.TH landscape-client 1 "05 January 2017" "" ""
 .SH NAME
 \fBlandscape-client \fP- Landscape system client
 \fB
@@ -33,12 +33,12 @@
 \fB-c\fP FILE, \fB--config\fP=FILE
 Use config from this file (any command line 
 \fIoptions\fP override settings from the file). (default:
-'/etc/landscape/client.conf')
+\(cq/etc/landscape/client.conf')
 .TP
 .B
 \fB-d\fP PATH, \fB--data-path\fP=PATH
 The directory to store data files in (default:
-'/var/lib/landscape/client/').
+\(cq/var/lib/landscape/client/').
 .TP
 .B
 \fB-q\fP, \fB--quiet\fP
@@ -47,7 +47,7 @@
 .B
 \fB-l\fP FILE, \fB--log-dir\fP=FILE
 The directory to write log files to (default:
-'/var/log/landscape').
+\(cq/var/log/landscape').
 .TP
 .B
 \fB--log-level\fP=LOG_LEVEL

=== modified file 'man/landscape-config.1'
--- man/landscape-config.1	2014-07-10 19:16:56 +0000
+++ man/landscape-config.1	2017-01-18 09:59:00 +0000
@@ -1,5 +1,5 @@
-.\"Text automatically generated by txt2man
-.TH landscape-config 1 "10 July 2014" "" ""
+.\" Text automatically generated by txt2man
+.TH landscape-config 1 "05 January 2017" "" ""
 .SH NAME
 \fBlandscape-config \fP- configure the Landscape management client
 \fB

=== removed file 'man/landscape-message.1'
--- man/landscape-message.1	2014-07-10 19:16:56 +0000
+++ man/landscape-message.1	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-.\"Text automatically generated by txt2man
-.TH landscape-message 1 "10 July 2014" "" ""
-.SH NAME
-\fBlandscape-message \fP- Send a message to the landscape web interface
-\fB
-.SH SYNOPSIS
-.nf
-.fam C
-\fBlandscape-message\fP [\fIoptions\fP] [\fIMESSAGE\fP] \.\.\.
-
-.fam T
-.fi
-.fam T
-.fi
-.SH DESCRIPTION
-
-Invoking \fBlandscape-message\fP will cause a message to appear in the
-History section for this computer in the Landscape web UI.
-.PP
-If no \fIMESSAGE\fP is specified on the command line, then \fBlandscape-message\fP
-will read the message from STDIN until EOF.
-.RE
-.PP
-
-.SH OPTIONS
-.TP
-.B
-\fB--version\fP
-Show program's version number and exit.
-.TP
-.B
-\fB-h\fP, \fB--help\fP
-Show this help message and exit.
-.TP
-.B
-\fB-b\fP BUS, \fB--bus\fP=BUS
-The DBUS bus to use to send the message.
-.SH EXAMPLES
-
-\fBlandscape-message\fP Hello administrator
-.RE
-.PP
-
-.SH SEE ALSO
-
-landscape-client (1)
-.RE
-.PP
-
-.SH AUTHOR
-Landscape Development Team <[e-mail]>

=== removed file 'man/landscape-message.txt'
--- man/landscape-message.txt	2012-03-05 14:11:42 +0000
+++ man/landscape-message.txt	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-NAME
-  landscape-message - Send a message to the landscape web interface
-
-SYNOPSIS
-  landscape-message [options] [MESSAGE] ...
-
-DESCRIPTION
-
-Invoking landscape-message will cause a message to appear in the
-History section for this computer in the Landscape web UI.
-
-If no MESSAGE is specified on the command line, then landscape-message
-will read the message from STDIN until EOF.
-
-
-OPTIONS
-  --version           Show program's version number and exit.
-  -h, --help          Show this help message and exit.
-  -b BUS, --bus=BUS   The DBUS bus to use to send the message.
-
-EXAMPLES
-
-  landscape-message Hello administrator
-
-
-SEE ALSO
-
-  landscape-client (1)
-
-
-AUTHOR
-  Landscape Development Team <[e-mail]>

=== modified file 'man/landscape-sysinfo.1'
--- man/landscape-sysinfo.1	2014-07-10 19:16:56 +0000
+++ man/landscape-sysinfo.1	2017-01-18 09:59:00 +0000
@@ -1,5 +1,5 @@
-.\"Text automatically generated by txt2man
-.TH landscape-sysinfo 1 "10 July 2014" "" ""
+.\" Text automatically generated by txt2man
+.TH landscape-sysinfo 1 "05 January 2017" "" ""
 .SH NAME
 \fBlandscape-sysinfo \fP- Display a summary of the current system status
 \fB

=== removed file 'scripts/landscape-dbus-proxy'
--- scripts/landscape-dbus-proxy	2013-06-03 07:23:35 +0000
+++ scripts/landscape-dbus-proxy	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-#!/usr/bin/env python
-"""
-This script is needed in case the client is upgrading from a pre-AMP version
-using Dbus as the messaging mechanism (like the landscape-client package from
-the lucid archives).
-This allows the package changer to send package changes to the broker using
-Dbus.
-
-This will only be run for old packages depending on DBus, we don't need to
-depend on DBus in the current version.
-"""
-
-import os
-import dbus
-import dbus.service
-import dbus.glib # This as side effects, don't remove it!
-
-from dbus.service import Object, BusName, method
-
-from twisted.internet import glib2reactor
-glib2reactor.install()
-from twisted.internet import reactor
-
-from landscape.lib.bpickle import loads
-from landscape.lib.lock import lock_path, LockError
-from landscape.reactor import LandscapeReactor
-from landscape.deployment import Configuration
-from landscape.broker.amp import RemoteBrokerConnector
-
-
-BUS_NAME = "com.canonical.landscape.Broker"
-OBJECT_PATH = "/com/canonical/landscape/Broker"
-
-
-def array_to_string(array):
-    """Convert an L{Array} of L{Byte}s (or integers) to a Python str."""
-    result = []
-    for item in array:
-        if item < 0:
-            item = item + 256
-        result.append(chr(item))
-    return "".join(result)
-
-
-class BrokerDBusObject(Object):
-    """A DBus-published object proxying L{RemoteBroker.send_message}.
-
-    It is used when upgrading from a DBus-based version of the Landscape client
-    to the newer AMP-based one, for letting the old package-changer process
-    performing the upgrade communicate with the new version of the client.
-    """
-    bus_name = BUS_NAME
-    object_path = OBJECT_PATH
-
-    def __init__(self, config):
-        super(BrokerDBusObject, self).__init__(BusName(
-            self.bus_name, dbus.SystemBus()), object_path=self.object_path)
-        self.config = config
-
-    @method(BUS_NAME)
-    def send_message(self, message, urgent=True):
-        """Queue the given message in the message exchange."""
-        message = loads(array_to_string(message))
-
-        def cb_connected(broker):
-            result = broker.send_message(message, urgent=True)
-            return result.addCallback(cb_done)
-
-        def cb_done(ignored):
-            return reactor.stop()
-
-        landscape_reactor = LandscapeReactor()
-        connector = RemoteBrokerConnector(landscape_reactor, self.config)
-        connected = connector.connect()
-        connected.addCallback(cb_connected)
-
-
-if __name__ == "__main__":
-    config = Configuration()
-    lock_dir = os.path.join(config.data_path, "package")
-    if os.path.isdir(lock_dir):
-        lock_filename = os.path.join(lock_dir, "changer.lock")
-        try:
-            lock_path(lock_filename)
-        except LockError:
-            # The package-changer is running, this means that we're upgrading from
-            # a non-AMP version and that the upgrade is Landscape driven, so let's
-            # expose the DBus broker proxy to give a chance to the package-changer
-            # to send its result message.
-            remote = BrokerDBusObject(config)
-            reactor.run()

=== removed file 'scripts/landscape-message'
--- scripts/landscape-message	2008-09-08 17:49:13 +0000
+++ scripts/landscape-message	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/usr/bin/python
-import sys, os
-if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
-    sys.path.insert(0, "./")
-
-from landscape.textmessage import run
-
-run()

=== modified file 'setup.py'
--- setup.py	2016-01-07 10:45:00 +0000
+++ setup.py	2017-01-18 09:59:00 +0000
@@ -22,18 +22,14 @@
                 "landscape.upgraders",
                 "landscape.user",
                 "landscape.lib"],
-      data_files=[
-          ("/etc/dbus-1/system.d/", ["dbus-1/landscape.conf"])],
       scripts=["scripts/landscape-client",
                "scripts/landscape-config",
-               "scripts/landscape-message",
                "scripts/landscape-broker",
                "scripts/landscape-manager",
                "scripts/landscape-monitor",
                "scripts/landscape-package-changer",
                "scripts/landscape-package-reporter",
                "scripts/landscape-release-upgrader",
-               "scripts/landscape-sysinfo",
-               "scripts/landscape-dbus-proxy"],
+               "scripts/landscape-sysinfo"],
       cmdclass={"build": build_extra.build_extra,
                 "clean": clean_build_tree})