chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
82badb8
)
fix handling unreadable images in update.extract_apk_icons
author
Michael Pöhn
<michael.poehn@fsfe.org>
Sat, 16 Dec 2017 21:06:20 +0000
(22:06 +0100)
committer
Michael Pöhn
<michael.poehn@fsfe.org>
Sat, 16 Dec 2017 21:06:20 +0000
(22:06 +0100)
fdroidserver/update.py
patch
|
blob
|
history
diff --git
a/fdroidserver/update.py
b/fdroidserver/update.py
index 782d18fcf356b867e80f22022fe543d7b0bece9e..3015e337ca6325813337e1a8c6bb6dd66a7f4178 100644
(file)
--- a/
fdroidserver/update.py
+++ b/
fdroidserver/update.py
@@
-1475,6
+1475,7
@@
def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
icon_path = os.path.join(get_icon_dir(repo_dir, '0'), icon_filename)
with open(icon_path, 'wb') as f:
f.write(get_icon_bytes(apkzip, icon_src))
+ im = None
try:
im = Image.open(icon_path)
dpi = px_to_dpi(im.size[0])
@@
-1491,7
+1492,8
@@
def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
logging.warning(_("Failed reading {path}: {error}")
.format(path=icon_path, error=e))
finally:
- im.close()
+ if im:
+ im.close()
if apk['icons']:
apk['icon'] = icon_filename