Merge lp:~cyphermox/ubuntu/natty/cnetworkmanager/lp677589 into lp:ubuntu/natty/cnetworkmanager

[Mathieu Trudel-Lapierre]

[Artur Rona (ari-tczew)]

Please complete patch with DEP3 tags.
https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines

review: Needs Fixing

[lp:~cyphermox/ubuntu/natty/cnetworkmanager/lp677589]

5. By Mathieu Trudel-Lapierre on 2010-11-20

Add missing DEP-3 tags for the patch. Oops.

[Artur Rona (ari-tczew)]

Please improve debian/changelog entry with following suggestion:

target to natty: s/UNRELEASED/natty

  * debian/patches/nm_0-8-2_dbus_api.patch: Unbreak as much as possible
    of cnetworkmanager to work with NM 0.8.2 and above. Some DBUS API changes broke
    ap listing, connection, etc. Which really should work for the package to be useful.
    (LP: #677589)

update timestamp would be nice.;
add dot at the end of subject tag;
add tag 'Description' before sentence in line 4 (patch), so should look like Description: There has been...

Package built fine.

review: Needs Fixing

[lp:~cyphermox/ubuntu/natty/cnetworkmanager/lp677589]

6. By Mathieu Trudel-Lapierre on 2010-12-08

Apply a few more formatting changes suggested by Artur Rona. Thanks!

[Mathieu Trudel-Lapierre (cyphermox)]

I'll respectfully disagree on some points:

 - target to Natty; I'm fine with applying this change (and I did), but it's not strictly required. It's also fairly common procedure to submit UNRELEASED changes for sponsoring, then the sponsor will use dch -t or whatnot to release/commit/upload.

 - entry format: I think this is to be left to the individual maintainers. There is no guideline or rule made for how a changelog entry should look, and for other networkmanager packages we've been routinely using the "previous" format (the one I initially had in changelog. That said, I don't feel strongly for either way, so I've updated it.

 - DEP-3 states: "When Subject is used, it is expected that the long description is outside of the structured fields." which is why I've added a short description on the Subject: line, and a long description outside of structured fields.

[Artur Rona (ari-tczew)]

Now looks good. Please reconsider forwarding this patch to Debian and upstream.

Thank you for your contribution!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-06 19:49:12 +0000
+++ debian/changelog	2010-12-08 15:56:33 +0000
@@ -1,3 +1,12 @@
+cnetworkmanager (0.21.1-1.1ubuntu1) natty; urgency=low
+
+  * debian/patches/nm_0-8-2_dbus_api.patch: Unbreak as much as possible
+    of cnetworkmanager to work with NM 0.8.2 and above. Some DBUS API
+    changes broke ap listing, connection, etc. Which really should work
+    for the package to be useful. (LP: #677589)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 08 Dec 2010 10:52:08 -0500
+
 cnetworkmanager (0.21.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

=== modified file 'debian/control'
--- debian/control	2010-09-06 19:49:12 +0000
+++ debian/control	2010-12-08 15:56:33 +0000
@@ -1,7 +1,8 @@
 Source: cnetworkmanager
 Section: net
 Priority: extra
-Maintainer: Python Applications Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Python Applications Packaging Team <[e-mail]>
 Uploaders: W. Martin Borgert <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 7), python, python-support, xsltproc, docbook-xsl
 Standards-Version: 3.8.4

=== added directory 'debian/patches'
=== added file 'debian/patches/nm_0-8-2_dbus_api.patch'
--- debian/patches/nm_0-8-2_dbus_api.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/nm_0-8-2_dbus_api.patch	2010-12-08 15:56:33 +0000
@@ -0,0 +1,109 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Have cnetworkmanager deal with NM 0.8.2's DBus API.
+Bug-Ubuntu: https://launchpad.net/bugs/677589
+
+There has been a number of changes in the API for NM since the last
+upstream release of cnetworkmanager, and even more with the release
+of NetworkManager 0.8.2. Attempt to cope with the new API in two ways:
+
+ 1) Set the correct DBus API Interface for Wired / Wireless devices
+ 2) Attempt a basic level of support for inheritance of DBus interfaces
+
+The second is done by providing a "base interface" from which different
+types of devices could "inherit" or require to use.
+
+One a first call with the "real" interface specific to a device fails
+with an AccessDenied DBus error, try a second time to issue the call
+with the base interface for .Device. In reality, there aren't really
+so many more levels of inheritance in devices types past that.
+ 
+Index: cnetworkmanager-0.21.1/dbusclient/__init__.py
+===================================================================
+--- cnetworkmanager-0.21.1.orig/dbusclient/__init__.py	2010-11-19 12:26:55.076768001 -0500
++++ cnetworkmanager-0.21.1/dbusclient/__init__.py	2010-11-19 12:27:03.946768001 -0500
+@@ -35,10 +35,13 @@
+         if introspection does not provide it for a method/property
+         """
+ 
+-        # FIXME common for this class, all classes?
+         self.__default_interface = kwargs.pop("default_interface", None)
++
+         super(DBusMio, self).__init__(conn, bus_name, object_path, introspect, follow_name_owner_changes, **kwargs)
+ 
++    def set_base_iface(self, iface):
++	self.__base_interface = iface
++
+     def __getattr__(self, name):
+         """Proxied DBus methods.
+ 
+@@ -72,9 +75,14 @@
+         """
+ 
+         iface = self.__default_interface # TODO cache
++	base_iface = self.__base_interface
+         # TODO _introspect_property_map
+         pmi = dbus.Interface(self, "org.freedesktop.DBus.Properties")
+-        return pmi.Get(iface, key, byte_arrays=True)
++        try:
++            return pmi.Get(iface, key, byte_arrays=True)
++        except dbus.exceptions.DBusException, e:
++            if "AccessDenied" in e.get_dbus_name():
++                return pmi.Get(base_iface, key, byte_arrays=True)
+ 
+     def __setitem__(self, key, value):
+         """Proxies DBus properties as dictionary items.
+@@ -89,7 +97,9 @@
+         iface = self.__default_interface # TODO cache
+         # TODO _introspect_property_map
+         pmi = dbus.Interface(self, "org.freedesktop.DBus.Properties")
+-        return pmi.Set(iface, key, value, byte_arrays=True)
++        pmi_res = pmi.Set(iface, key, value, byte_arrays=True)
++        if not pmi_res:
++            return pmi.Set(base_iface, key, value, byte_arrays=True)
+ 
+ def _mklist(x):
+     """Return a list.
+@@ -112,6 +122,8 @@
+         "properties": {},
+         }
+ 
++    def set_base_iface(self, iface):
++        super(DBusClient, self).set_base_iface(iface)
+     
+     @classmethod
+     def _get_adaptor(cls, kind, name):
+Index: cnetworkmanager-0.21.1/networkmanager/device.py
+===================================================================
+--- cnetworkmanager-0.21.1.orig/networkmanager/device.py	2010-11-19 12:27:00.316768002 -0500
++++ cnetworkmanager-0.21.1/networkmanager/device.py	2010-11-19 12:27:03.946768001 -0500
+@@ -162,6 +162,8 @@
+     def __init__(self, opath):
+         """Inits the base class, unlike _create"""
+         super(Device, self).__init__(dbus.SystemBus(), self.SERVICE, opath, default_interface = self.IFACE)
++        if self.BASE_IFACE:
++            super(Device, self).set_base_iface(self.BASE_IFACE)
+ 
+ 
+     _constructors = {}
+@@ -209,8 +211,9 @@
+     def _settings_type(cls):
+         return "802-3-ethernet"
+ 
+-    # FIXME but also use parent iface
+-    IFACE = "org.freedesktop.NetworkManager.Device"
++    IFACE = "org.freedesktop.NetworkManager.Device.Wired"
++    BASE_IFACE = "org.freedesktop.NetworkManager.Device"
++
+     # FIXME how to get parent adaptors?
+ Wired._add_adaptors(
+ #    PropertiesChanged = SA(identity),
+@@ -238,6 +241,9 @@
+     def _settings_type(cls):
+         return "802-11-wireless"
+ 
++    IFACE = "org.freedesktop.NetworkManager.Device.Wireless"
++    BASE_IFACE = "org.freedesktop.NetworkManager.Device"
++
+ Wireless._add_adaptors(
+     GetAccessPoints = MA(seq_adaptor(AccessPoint)),
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2010-12-08 15:56:33 +0000
@@ -0,0 +1,1 @@
+nm_0-8-2_dbus_api.patch