lp://staging/~dobey/aptdaemon/fix-imports

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/aptdaemon at revision 850

Aptdaemon Developers: Pending requested 2012-08-09

Diff: 25 lines (+2/-2)

2 files modified

aptdaemon/client.py (+1/-1)
aptdaemon/debconf.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1035032: New aptdaemon.client breaks apps using twisted with gireactor

Undecided

Fix Committed

Link a bug report

Related blueprints

850. By dobey on 2012-08-09

Check that the item in sys.modules is not None before trying to import it

849. By Martin Pitt on 2012-08-02

fix "compatibilty" typo

848. By Martin Pitt on 2012-07-12

aptdaemon/client.py: Prefer GI GObject module

If 'gobject' is not available (such as in Python 3), but this module gets
imported before importing any gi.repository module, aptdaemon crashes with

Traceback (most recent call last):
  File "./software-properties-gtk", line 37, in <module>
    from softwareproperties.gtk.SoftwarePropertiesGtk import SoftwarePropertiesGtk
  File "/home/martin/ubuntu/software-properties-additional-drivers/softwareproperties/gtk/SoftwarePropertiesGtk.py", line 34, in <module>
    from aptdaemon import client
  File "/usr/lib/python3/dist-packages/aptdaemon/client.py", line 43, in <module>
    import gobject as GObject
ImportError: No module named gobject

Fix this by swapping the order around and only using gobject if it is already imported.

847. By Sebastian Heinlein on 2012-06-17

lintian supports skipping user profiles since 2.5.9

If $HOME is unset custom profiles of the user will be skipped. Make use of this.
Unfortunately we need a complete LINTIAN_ROOT for the test case - so we have to copy it around.

846. By Sebastian Heinlein on 2012-06-14

test: Give the fake-polkitd more time to get known to DBus. Thanks Steve.

Would be nice to switch this to dbus activation in the future

845. By Sebastian Heinlein on 2012-06-14

test: run the fake-polkitd also with Python 3. Thanks pitti for spotting

844. By Sebastian Heinlein on 2012-06-13

Merge fixes from Steve! Thanks

843. By Sebastian Heinlein on 2012-06-13

Fix PK tests

842. By Sebastian Heinlein on 2012-06-13

test: Set apt_pkg.config["Dir"] to the chroot

This is required by the key handling of apt.auth to use the chroot. In the
other tests it gets set by apt.Cache()

841. By Michael Vogt on 2012-06-12

merged lp:~aptdaemon-developers/aptdaemon/lintian-profiles