← Back to branch summary

~stub/ubuntu/precise/calibre/devel

« back to all changes in this revision

Viewing changes to src/calibre/devices/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-04-12 11:29:25 UTC
  • mfrom: (42.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110412112925-c7171kt2bb5rmft4
Tags: 0.7.50+dfsg-2
http://bugs.debian.org/619632
http://bugs.debian.org/619807
http://bugs.debian.org/619701
http://bugs.debian.org/620125
* debian/control: Build with libpodofo-dev to enable PDF metadata.
  (Closes: #619632)
* debian/control: Add libboost1.42-dev build dependency. Apparently it is
  needed in some setups. (Closes: #619807)
* debian/rules: Call dh_sip to generate a proper sip API dependency, to
  prevent crashes like #616372 for partial upgrades.
* debian/control: Bump python-qt4 dependency to >= 4.8.3-2, which reportedly
  fixes crashes on startup. (Closes: #619701, #620125)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/devices/__init__.py
47
47
 
48
48
    for d in connected_devices:
49
49
        try:
50
 
            d.open()
 
50
            d.open(None)
51
51
        except:
52
52
            continue
53
53
        else:
121
121
            out('Trying to open', dev.name, '...', end=' ')
122
122
            try:
123
123
                dev.reset(detected_device=det)
124
 
                dev.open()
 
124
                dev.open(None)
125
125
                out('OK')
126
126
            except:
127
127
                import traceback