Fix datatype and encoding for yum spider

diff --git a/pgweb/downloads/views.py b/pgweb/downloads/views.py
index c95f7810177328668fce417c684583628d8e632f..05512876f4eb394518b474fc27bdf37a28948738 100644 (file)
--- a/pgweb/downloads/views.py
+++ b/pgweb/downloads/views.py
@@ -163,7 +163,7 @@ def uploadyum(request):
         return HttpServerError(request, "Invalid client address")
     # We have the data in request.body. Attempt to load it as
     # json to ensure correct format.
-    json.loads(request.body)
+    json.loads(request.body.decode('utf8'))
 
     # Next, check if it's the same as the current file
     if os.path.isfile(settings.YUM_JSON):

diff --git a/tools/ftp/spider_yum.py b/tools/ftp/spider_yum.py
index e969742877a543647d3b551ed858eaccd6b853ad..502eb4b14fb25f74d0c648d177d0b05b5692c675 100755 (executable)
--- a/tools/ftp/spider_yum.py
+++ b/tools/ftp/spider_yum.py
@@ -80,7 +80,7 @@ if __name__ == "__main__":
                         if pinfo['p'] == familypath and pinfo['f'] == shortdist:
                             if p not in reporpms[v]:
                                 reporpms[v][p] = {}
-                            reporpms[v][p][arch] = max(ver, reporpms[v][p].get(arch, 0))
+                            reporpms[v][p][arch] = max(int(ver), int(reporpms[v][p].get(arch, 0)))
                             platforms[p]['found'] = True
                             break
                     else: