projects
/
rarslave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[RARSLAVE] Fix exception syntax
[rarslave2.git]
/
rarslave.py
diff --git
a/rarslave.py
b/rarslave.py
index
bfed51f
..
27db583
100644
(file)
--- a/
rarslave.py
+++ b/
rarslave.py
@@
-209,8
+209,8
@@
def find_likely_files (dir, p2file):
name_matches = [f for f in os.listdir (dir) if regex.match (f)]
try:
name_matches = [f for f in os.listdir (dir) if regex.match (f)]
try:
- parsed_matches =
par2p
arser.get_protected_files (dir, p2file)
- except
EnvironmentError
:
+ parsed_matches =
Par2P
arser.get_protected_files (dir, p2file)
+ except
(EnvironmentError, OSError, OverflowError)
:
parsed_matches = []
logger.addMessage ('Bad par2 file: %s' % p2file, RarslaveLogger.MessageType.Fatal)
parsed_matches = []
logger.addMessage ('Bad par2 file: %s' % p2file, RarslaveLogger.MessageType.Fatal)
@@
-281,9
+281,9
@@
def find_extraction_heads (dir, files):
for f in p2files:
done = False
try:
for f in p2files:
done = False
try:
- prot_files =
par2p
arser.get_protected_files (dir, f)
+ prot_files =
Par2P
arser.get_protected_files (dir, f)
done = True
done = True
- except
EnvironmentError
:
+ except
(EnvironmentError, OverflowError, OSError)
:
logger.addMessage ('Error parsing PAR2 file: %s', f)
continue
logger.addMessage ('Error parsing PAR2 file: %s', f)
continue
@@
-419,7
+419,7
@@
def delete_list (dir, files, interactive=False):
done = False
valid_y = ['Y', 'YES']
done = False
valid_y = ['Y', 'YES']
- valid_n = ['N', 'NO']
+ valid_n = ['N', 'NO'
, ''
]
if interactive:
while not done:
if interactive:
while not done: