Merge lp:~tribaal/landscape-client/cleanup-dbus-dependencies into lp:~landscape/landscape-client/trunk

[Chris Glass]

Remove dbus dependency from the landscape-client package.

A small branch that removes the dbus dependency from the landscape-client package.

NB: The landscape-client-ui package still needs dbus!

[Christopher Armstrong (radix)]

[1] Why do we need the dbus-1/landscape.conf at all? At the very least, there's other "Hal" stuff in there that I don't think is necessary any more, but do we need any of the stuff about the individual Landscape components?

+1! Burn, dbus, burn!

[Christopher Armstrong (radix)]

review: Approve

[Björn Tillenius (bjornt)]

Looks good to me, basically +1.

I have some comments. [1] needs to be resolved, but the others are not dbus
related, so could go in another branch.

[1]

=== modified file 'debian/landscape-client.install'
--- debian/landscape-client.install 2012-03-05 14:11:42 +0000
+++ debian/landscape-client.install 2013-05-20 07:31:31 +0000
@@ -10,5 +10,4 @@
 usr/bin/landscape-is-cloud-managed
 usr/bin/landscape-dbus-proxy

Hmm, so what's the deal with landscape-dbus-proxy? It still depends on dbus.

[2]

# hardy only
 ifneq (,$(findstring $(dist_release),hardy))
- # We depend on bug-fixed versions of python-dbus and pycurl on hardy
- echo "extra:Depends=python-dbus" >> $(landscape_common_substvars)
- echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
+ # We depend on bug-fixed versions pycurl on hardy
+ echo "extra:Depends=python-pycurl" >> $(landscape_client_substvars)

We should clean up this part of the rules file, not to care about hardy anymore.

[3]

 ifeq (,$(filter $(dist_release),hardy lucid))
- # Starting natty, no more hal or dbus
  echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3)" >> $(landscape_common_substvars)
  echo "extra:Depends=python-pycurl, gir1.2-gudev-1.0 (>= 165-0ubuntu2), python-gi" >>

Are gir1.2-gudev-1.0 and python-gi needed for any of the non-ui packages?

review: Needs Information

[Björn Tillenius (bjornt)]

Could you please also add to the dbus-proxy comment, explaining that it will only be run for old packages depending on dbus, so we don't need to depend on dbus in the current package.

review: Approve

[Chris Glass (tribaal)]

I took the initiative to clean up the rules files a bit.

Most of the contitional "depends" are now gone since we dropped hardy support and hal dependency altogether (yay!).
python-pycurl and libpam-modules are now defined in the control file directly.

This makes the rules file much easier to read.

[Björn Tillenius (bjornt)]

On Mon, Jun 03, 2013 at 10:23:44AM -0000, Chris Glass wrote:
> I took the initiative to clean up the rules files a bit.
>
> Most of the contitional "depends" are now gone since we dropped hardy support and hal dependency altogether (yay!).
> python-pycurl and libpam-modules are now defined in the control file directly.
>
> This makes the rules file much easier to read.

Thanks, it does look much better now, +1!

I saw this, though:

 # from quantal onwards, we don't want python-gnupginterface anymore
 (#1045237)
  ifneq (,$(filter $(dist_release),hardy lucid oneiric precise))

Could you please remove hardy and oneiric from that list? They are both
EOL.

[Chris Glass (tribaal)]

(wrong tab :/)

review: Abstain

[🤖 Landscape Builder (landscape-builder)]

Voting does not meet specified criteria. Required: Approve >= 2, Disapprove == 0. Got: 1 Approve.

[Chris Glass (tribaal)]

Will mark myself as approved, since tarmac is not very cooperative and does not count radix's review as valid anymore :(

review: Approve

=== removed directory 'dbus'
=== renamed file 'dbus/landscape.conf' => 'dbus-1/landscape.conf'
--- dbus/landscape.conf	2013-05-07 13:10:13 +0000
+++ dbus-1/landscape.conf	2013-06-03 12:47:31 +0000
@@ -16,17 +16,6 @@
     <allow send_destination="com.canonical.landscape.Manager" />
     <allow receive_sender="com.canonical.landscape.Manager" />
 
-    <allow send_interface="org.freedesktop.Hal.Manager" />
-    <allow send_interface="org.freedesktop.Hal.Device" />
-
-  </policy>
-
-  <policy user="haldaemon">
-    <!-- XXX: Is there a better way to do this? -->
-    <allow receive_sender="com.canonical.landscape.Manager" />
-    <allow receive_sender="com.canonical.landscape.Monitor" />
-    <allow receive_sender="com.canonical.landscape.Broker" />
-
   </policy>
 
   <policy user="root">

=== modified file 'debian/control'
--- debian/control	2012-11-20 19:40:59 +0000
+++ debian/control	2013-06-03 12:47:31 +0000
@@ -19,7 +19,8 @@
          lsb-base,
          adduser,
          bc,
-         lshw
+         lshw,
+         libpam-modules
 Suggests: ${extra:Suggests}
 # added/changed when we moved the sysinfo manpage from client to common
 # in r582. There is no accompaining "Breaks" because -client requires
@@ -41,6 +42,7 @@
          ${shlibs:Depends},
          python-twisted-web,
          python-twisted-names,
+         python-pycurl,
          landscape-common (= ${binary:Version})
 Suggests: ${extra:Suggests}
 Description: The Landscape administration system client

=== modified file 'debian/landscape-client-ui.install'
--- debian/landscape-client-ui.install	2012-03-22 18:43:44 +0000
+++ debian/landscape-client-ui.install	2013-06-03 12:47:31 +0000
@@ -6,4 +6,5 @@
 usr/share/polkit-1/actions/com.canonical.LandscapeClientSettings.policy
 etc/dbus-1/system.d/com.canonical.LandscapeClientSettings.conf
 etc/dbus-1/system.d/com.canonical.LandscapeClientRegistration.conf
+etc/dbus-1/system.d/landscape.conf
 usr/share/glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml

=== modified file 'debian/landscape-client.install'
--- debian/landscape-client.install	2012-03-05 14:11:42 +0000
+++ debian/landscape-client.install	2013-06-03 12:47:31 +0000
@@ -10,5 +10,4 @@
 usr/bin/landscape-is-cloud-managed
 usr/bin/landscape-dbus-proxy
 usr/share/landscape/cloud-default.conf
-etc/dbus-1/system.d/landscape.conf
 usr/lib/landscape

=== modified file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	2013-04-18 08:41:48 +0000
+++ debian/landscape-client.postinst	2013-06-03 12:47:31 +0000
@@ -108,7 +108,8 @@
             rm $very_old_cron_job
         fi
 
-        # Check if we're upgrading from a D-Bus version
+        # 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

=== modified file 'debian/rules'
--- debian/rules	2012-11-22 19:25:47 +0000
+++ debian/rules	2013-06-03 12:47:31 +0000
@@ -64,10 +64,10 @@
 
 	python setup.py install --root $(root_dir) $(py_setup_install_args)
 
+	# Keep in mind that some installed files are defined in setup.py
 	install -D -o root -g root -m 755 debian/landscape-sysinfo.wrapper $(root_dir)/usr/share/landscape/landscape-sysinfo.wrapper
 	install -D -o root -g root -m 644 debian/cloud-default.conf $(root_dir)/usr/share/landscape/cloud-default.conf
 	install -D -o root -g root -m 755 apt-update/apt-update $(root_dir)/usr/lib/landscape/apt-update
-	install -D -o root -g root -m 644 dbus/landscape.conf $(root_dir)/etc/dbus-1/system.d/landscape.conf
 
 binary-indep:
 # do nothing
@@ -88,29 +88,8 @@
 	dh_fixperms
 	dh_shlibdeps
 
-# hardy only
-ifneq (,$(findstring $(dist_release),hardy))
-	# We depend on bug-fixed versions of python-dbus and pycurl on hardy
-	echo "extra:Depends=python-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
-	# The python-image-store-proxy package is needed for the eucalyptus plugin
-	echo "extra:Suggests=python-image-store-proxy" >> $(landscape_common_substvars)
-endif
-# lucid only
-ifneq (,$(filter $(dist_release),lucid))
-	# We want libpam-modules in lucid
-	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
-endif
-# not hardy, not lucid
-ifeq (,$(filter $(dist_release),hardy lucid))
-	# Starting natty, no more hal or dbus
-	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3)" >> $(landscape_common_substvars)
-	echo "extra:Depends=python-pycurl, gir1.2-gudev-1.0 (>= 165-0ubuntu2), python-gi" >> $(landscape_client_substvars)
-	echo "extra:Suggests=python-dbus, hal" >> $(landscape_client_substvars)
-endif
 # from quantal onwards, we don't want python-gnupginterface anymore (#1045237)
-ifneq (,$(filter $(dist_release),hardy lucid oneiric precise))
+ifneq (,$(filter $(dist_release),lucid precise))
 	echo "extra:Depends=python-gnupginterface" >> $(landscape_common_substvars)
 endif
 

=== modified file 'scripts/landscape-dbus-proxy'
--- scripts/landscape-dbus-proxy	2013-05-15 21:42:49 +0000
+++ scripts/landscape-dbus-proxy	2013-06-03 12:47:31 +0000
@@ -1,4 +1,14 @@
 #!/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
@@ -39,7 +49,6 @@
     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
 

=== modified file 'setup.py'
--- setup.py	2013-05-03 12:36:06 +0000
+++ setup.py	2013-06-03 12:47:31 +0000
@@ -1,12 +1,15 @@
 #!/usr/bin/python
 
-from distutils.core import setup, Extension
+from distutils.core import setup
 
 from landscape import UPSTREAM_VERSION
 
 from DistUtilsExtra.command import build_extra, build_i18n
 from DistUtilsExtra.auto import clean_build_tree
 
+# This is just because the path is hard to line-break.
+glib_path = [
+    "glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml"]
 
 setup(name="Landscape Client",
       version=UPSTREAM_VERSION,
@@ -35,14 +38,14 @@
       data_files=[
           ("/usr/share/dbus-1/system-services/",
            ["dbus-1/com.canonical.LandscapeClientSettings.service",
-          "dbus-1/com.canonical.LandscapeClientRegistration.service"]),
+            "dbus-1/com.canonical.LandscapeClientRegistration.service"]),
           ("/etc/dbus-1/system.d/",
            ["dbus-1/com.canonical.LandscapeClientSettings.conf",
-            "dbus-1/com.canonical.LandscapeClientRegistration.conf"]),
+            "dbus-1/com.canonical.LandscapeClientRegistration.conf",
+            "dbus-1/landscape.conf"]),
           ("/usr/share/icons/hicolor/scalable/apps/",
            ["icons/preferences-management-service.svg"]),
-          ("/usr/share/glib-2.0/schemas/",
-           ["glib-2.0/schemas/com.canonical.landscape-client-settings.gschema.xml"])],
+          ("/usr/share/glib-2.0/schemas/", glib_path)],
       scripts=["scripts/landscape-client",
                "scripts/landscape-config",
                "scripts/landscape-message",