Fix several read_metadata-related issues

Various calls with the wrong parameters, and also an unused parameter on
the function itself.

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 590949a2aeeaff661e4ac7ff15624a2c4498bcb9..5bb63e513de77a3733f3d8807b477b1b96a3b73c 100644 (file)
--- 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 441a20ed203c1e8e30cd87e3f6dba6fc131ffe58..29f062b0fc74b9398de601bb753856f565e934ee 100644 (file)
--- 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 ff3533a62c5324e626691f9e41208a10e057cc9b..9cf18eea593908cc95f84f3c5bf7e546a8f0e522 100644 (file)
--- 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 9c373a10748eae4f2766e0cf418b5a02e7608ca7..3aa15a02b148809a076d03b1c1657a1b0a1f1a45 100644 (file)
--- 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 c2f9835c450ca3f75a13b1dcbe5bdf414f6a56a0..ff3a43b977effd6bea7109003f9ec6750715abdf 100644 (file)
--- 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')