← Back to branch summary

~ubuntu-branches/ubuntu/karmic/calibre/karmic

« back to all changes in this revision

Viewing changes to src/calibre/library/database2.py

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-05-10 21:00:35 UTC
  • mfrom: (1.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090510210035-1s6iakw8qk4cxu4n
Tags: 0.5.11+dfsg-1
http://bugs.debian.org/525612
* New upstream release.
* debian/control: Drop Ubuntu specific python-mechanize binary dependency as
  well (brown paperbag). (Closes: #525612)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/library/database2.py
760
760
        path = os.path.join(self.library_path, self.path(id, index_is_id=True))
761
761
        self.data.remove(id)
762
762
        if os.path.exists(path):
763
 
            if iswindows:
 
763
            try:
764
764
                winshell.delete_file(path, no_confirm=True, silent=True)
765
 
            else:
 
765
            except:
766
766
                self.rmtree(path)
767
767
            parent = os.path.dirname(path)
768
768
            if len(os.listdir(parent)) == 0: