diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2009-12-15 02:40:17 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2009-12-15 02:40:17 +0000 |
| commit | 8b9a36bc2190b1e1c1063756c28b8db4c0272401 (patch) | |
| tree | 628a6e22e036b63b3b29084e38f88cf1df2d978c /deskutils/calibre/files/patch-src_calibre_linux.py | |
| parent | Make the problem more visible by choosing a more descriptive subject. (diff) | |
- Update to 0.6.27.
Diffstat (limited to '')
| -rw-r--r-- | deskutils/calibre/files/patch-src_calibre_linux.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/deskutils/calibre/files/patch-src_calibre_linux.py b/deskutils/calibre/files/patch-src_calibre_linux.py index 5614a76e87c2..d3192a434cdc 100644 --- a/deskutils/calibre/files/patch-src_calibre_linux.py +++ b/deskutils/calibre/files/patch-src_calibre_linux.py @@ -1,6 +1,6 @@ ---- src/calibre/linux.py.orig 2009-10-10 06:15:01.000000000 +0400 -+++ src/calibre/linux.py 2009-10-12 14:10:34.000000000 +0400 -@@ -128,10 +128,7 @@ +--- src/calibre/linux.py.orig 2009-12-11 15:04:41.000000000 -0800 ++++ src/calibre/linux.py 2009-12-14 17:29:52.000000000 -0800 +@@ -128,20 +128,12 @@ self.icon_resources = [] self.menu_resources = [] self.mime_resources = [] @@ -11,16 +11,17 @@ self.create_uninstaller() from calibre.utils.config import config_dir -@@ -140,8 +137,6 @@ - for f in os.listdir('.'): - if os.stat(f).st_uid == 0: - os.rmdir(f) if os.path.isdir(f) else os.unlink(f) -- if os.stat(config_dir).st_uid == 0: -- os.rmdir(config_dir) + if os.path.exists(config_dir): + os.chdir(config_dir) +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- os.rmdir(f) if os.path.isdir(f) else os.unlink(f) +- if os.stat(config_dir).st_uid == 0: +- os.rmdir(config_dir) if warn is None and self.warnings: self.info('There were %d warnings'%len(self.warnings)) -@@ -319,7 +314,7 @@ +@@ -318,7 +310,7 @@ def install_man_pages(self): try: from calibre.utils.help2man import create_man_page @@ -29,7 +30,7 @@ if not os.path.exists(manpath): os.makedirs(manpath) self.info('Installing MAN pages...') -@@ -332,7 +327,7 @@ +@@ -331,7 +323,7 @@ continue parser = parser() raw = create_man_page(prog, parser) |