diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2018-03-10 08:26:14 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2018-03-10 08:26:14 +0100 |
| commit | eec20995156a6cc78f0e669cf3778926835a9300 (patch) | |
| tree | d5dfe835628a8095c2ac66ff6c82abc7980601d6 /kindlecomicconverter | |
| parent | Merge pull request #261 from ciromattia/dev (diff) | |
| download | kcc-eec20995156a6cc78f0e669cf3778926835a9300.tar.gz kcc-eec20995156a6cc78f0e669cf3778926835a9300.tar.bz2 kcc-eec20995156a6cc78f0e669cf3778926835a9300.zip | |
Fixed unrar detection
Diffstat (limited to 'kindlecomicconverter')
| -rw-r--r-- | kindlecomicconverter/KCC_gui.py | 2 | ||||
| -rwxr-xr-x | kindlecomicconverter/comic2ebook.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 71e06de..7959b40 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -1009,7 +1009,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'info') rarExitCode = Popen('unrar', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True) rarExitCode = rarExitCode.wait() - if rarExitCode == 0 or rarExitCode == 7: + if rarExitCode == 0 or rarExitCode == 1 or rarExitCode == 7: self.UnRAR = True else: self.UnRAR = False diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 7aaf027..0f50519 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -1056,7 +1056,7 @@ def checkTools(source): if source.endswith('.CBR') or source.endswith('.RAR'): rarExitCode = Popen('unrar', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True) rarExitCode = rarExitCode.wait() - if rarExitCode != 0 and rarExitCode != 7: + if rarExitCode != 0 and rarExitCode != 1 and rarExitCode != 7: print('ERROR: UnRAR is missing!') exit(1) elif source.endswith('.CB7') or source.endswith('.7Z'): |