From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 27 Jan 2014 15:31:11 +0000 (+0100)
Subject: Last missing bit of Popen
X-Git-Tag: 0.2~353
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7f2cbd85ba17d1677369f29e0008994a6c16d14;p=fdroidserver.git

Last missing bit of Popen
---

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index 3b69082d..f64c6485 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -25,9 +25,10 @@ import traceback
 import glob
 from optparse import OptionParser
 import paramiko
-import common, metadata
 import socket
-import subprocess
+
+import common, metadata
+from common import FDroidPopen
 
 def carbon_send(key, value):
     s = socket.socket()
@@ -121,29 +122,30 @@ def main():
         for logfile in glob.glob(os.path.join(logsdir,'access-*.log.gz')):
             if options.verbose:
                 print '...' + logfile
-            p = subprocess.Popen(["zcat", logfile], stdout = subprocess.PIPE)
+            p = FDroidPopen(["zcat", logfile])
             matches = (logsearch(line) for line in p.stdout)
             for match in matches:
                 if match and match.group('statuscode') == '200':
                     uri = match.group('uri')
-                    if uri.endswith('.apk'):
-                        _, apkname = os.path.split(uri)
-                        app = knownapks.getapp(apkname)
-                        if app:
-                            appid, _ = app
-                            if appid in apps:
-                                apps[appid] += 1
-                            else:
-                                apps[appid] = 1
-                            # Strip the '.apk' from apkname
-                            appVer = apkname[:-4]
-                            if appVer in appsVer:
-                                appsVer[appVer] += 1
-                            else:
-                                appsVer[appVer] = 1
+                    if not uri.endswith('.apk'):
+                        continue
+                    _, apkname = os.path.split(uri)
+                    app = knownapks.getapp(apkname)
+                    if app:
+                        appid, _ = app
+                        if appid in apps:
+                            apps[appid] += 1
+                        else:
+                            apps[appid] = 1
+                        # Strip the '.apk' from apkname
+                        appVer = apkname[:-4]
+                        if appVer in appsVer:
+                            appsVer[appVer] += 1
                         else:
-                            if not apkname in unknownapks:
-                                unknownapks.append(apkname)
+                            appsVer[appVer] = 1
+                    else:
+                        if not apkname in unknownapks:
+                            unknownapks.append(apkname)
 
         # Calculate and write stats for total downloads...
         lst = []