• Bug#266158: oops, silly typo

    From Michael Banck@1:229/2 to All on Tue Aug 17 03:00:11 2004
    From: [email protected]

    Hi,

    there was a silly typo in the refreshed device-manager-properties-exception.patch. For completeness, I attached
    the correct version. This is the stripped-down interdiff:

    @@ -13,7 +13,7 @@
    + product = device.properties.get("info.product", "")
    + if product=="Computer":
    + return self.icons["computer"]
    -+ except: KeyError
    ++ except KeyError:
    + pass

    # First look at bus type, every device got Bus property


    Anyway, dbus-0.22 is needed because of an updated python API.


    cheers,

    Michael

    Index: hal-0.2.97/tools/device-manager/Representation.py ===================================================================
    --- hal-0.2.97.orig/tools/device-manager/Representation.py 2004-08-08 22:04:58.000000000 +0200
    +++ hal-0.2.97/tools/device-manager/Representation.py 2004-08-17 00:40:17.346999248 +0200
    @@ -46,9 +46,12 @@
    # Default to abstract icon
    icon = self.icons["abstract"]

    - product = device.properties.get("info.product", "")
    - if product=="Computer":
    - return self.icons["computer"]
    + try:
    + product = device.properties.get("info.product", "")
    + if product=="Computer":
    + return self.icons["computer"]
    + except KeyError:
    + pass

    # First look at bus type, every device got Bus property
    bus = device.properties["info.bus"]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Sjoerd Simons@1:229/2 to Michael Banck on Tue Aug 17 10:20:05 2004
    From: [email protected]

    On Tue, Aug 17, 2004 at 02:30:04AM +0200, Michael Banck wrote:
    Hi,

    there was a silly typo in the refreshed device-manager-properties-exception.patch. For completeness, I attached
    the correct version.

    That patch can be fully removed, the problem has been fixed upstream by using the get method of a dictionary instead of the normal [].

    Anyway, dbus-0.22 is needed because of an updated python API.

    I actually package hal cvs last sunday just to check it out. The changes for the new api can easily be reverted, so we could package hal 0.2.97 without needing dbus-0.22.

    Sjoerd
    --
    The Force is what holds everything together. It has its dark side, and
    it has its light side. It's sort of like cosmic duct tape.


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subject of "unsubscribe". Trouble? Contact [email protected]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)