From 277d95f57d227d336231a5256df78a5d329b4d7d Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 20 May 2014 17:48:45 +0100
Subject: [PATCH] Fix several read_metadata-related issues

Various calls with the wrong parameters, and also an unused parameter on
the function itself.
---
 fdroidserver/checkupdates.py | 2 +-
 fdroidserver/metadata.py     | 2 +-
 fdroidserver/readmeta.py     | 2 +-
 fdroidserver/rewritemeta.py  | 2 +-
 fdroidserver/stats.py        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 590949a2..5bb63e51 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -329,7 +329,7 @@ def main():
     config = common.read_config(options)
 
     # Get all apps...
-    allapps = metadata.read_metadata(options.verbose)
+    allapps = metadata.read_metadata()
 
     apps = common.read_app_args(args, allapps, False)
 
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 441a20ed..29f062b0 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -422,7 +422,7 @@ def parse_srclib(metafile, **kw):
 
 # Read all metadata. Returns a list of 'app' objects (which are dictionaries as
 # returned by the parse_metadata function.
-def read_metadata(xref=True, package=None, store=True):
+def read_metadata(xref=True, package=None):
     apps = []
 
     for basedir in ('metadata', 'tmp'):
diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index ff3533a6..9cf18eea 100644
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -26,7 +26,7 @@ def main():
     if not os.path.isdir('metadata'):
         return
 
-    metadata.read_metadata(xref=False, store=False)
+    metadata.read_metadata(xref=True)
 
 if __name__ == "__main__":
     main()
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 9c373a10..3aa15a02 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -42,7 +42,7 @@ def main():
     config = common.read_config(options)
 
     # Get all apps...
-    allapps = metadata.read_metadata(xref=False)
+    allapps = metadata.read_metadata(xref=True)
     apps = common.read_app_args(args, allapps, False)
 
     for app in apps:
diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index c2f9835c..ff3a43b9 100644
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -71,7 +71,7 @@ def main():
         sys.exit(1)
 
     # Get all metadata-defined apps...
-    metaapps = metadata.read_metadata(options.verbose)
+    metaapps = metadata.read_metadata()
 
     statsdir = 'stats'
     logsdir = os.path.join(statsdir, 'logs')