From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 24 Oct 2015 18:13:49 +0000 (+0200)
Subject: update: fix for 0fa6aac2881
X-Git-Tag: 0.5.0~33
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab667992c79503d73214f58e2eb05c6ced8b776a;p=fdroidserver.git

update: fix for 0fa6aac2881

For some reason, my up to date pyflakes didn't catch this.
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 41d96bff..f749a9e6 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -591,10 +591,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 try:
                     im = Image.open(iconpath)
                     dpi = px_to_dpi(im.size[0])
-                    for density in densities:
+                    for density in screen_densities:
                         if density in thisinfo['icons']:
                             break
-                        if density == densities[-1] or dpi >= int(density):
+                        if density == screen_densities[-1] or dpi >= int(density):
                             thisinfo['icons'][density] = iconfilename
                             shutil.move(iconpath,
                                         os.path.join(get_icon_dir(repodir, density), iconfilename))
@@ -610,7 +610,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
             # First try resizing down to not lose quality
             last_density = None
-            for density in densities:
+            for density in screen_densities:
                 if density not in empty_densities:
                     last_density = density
                     continue
@@ -637,7 +637,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
             # Then just copy from the highest resolution available
             last_density = None
-            for density in reversed(densities):
+            for density in reversed(screen_densities):
                 if density not in empty_densities:
                     last_density = density
                     continue
@@ -652,7 +652,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
                 empty_densities.remove(density)
 
-            for density in densities:
+            for density in screen_densities:
                 icon_dir = get_icon_dir(repodir, density)
                 icondest = os.path.join(icon_dir, iconfilename)
                 resize_icon(icondest, density)