From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 16 Mar 2014 08:43:24 +0000 (+0000)
Subject: Extra debug logging for autoname gathering
X-Git-Tag: 0.2~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e642561676a67c2b0907947e16ce4c2d28dba3f9;p=fdroidserver.git

Extra debug logging for autoname gathering
---

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index f8d901da..b56aa201 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -413,7 +413,10 @@ def main():
                     if 'gradle' in app['builds'][-1]:
                         flavour = app['builds'][-1]['gradle']
 
+                logging.debug("...fetch auto name from " + app_dir +
+                        ((" (flavour:" + flavour) if flavour else ""))
                 new_name = common.fetch_real_name(app_dir, flavour)
+                logging.debug("...got autoname '" + new_name + "'")
                 if new_name != app['Auto Name']:
                     app['Auto Name'] = new_name
                     if not commitmsg:
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7f7f9cfa..c63a4aa1 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -632,6 +632,7 @@ def fetch_real_name(app_dir, flavour):
     for f in manifest_paths(app_dir, flavour):
         if not has_extension(f, 'xml'):
             continue
+        logging.debug("fetch_real_name: Checking manifest at " + f)
         for line in file(f):
             if not app_found:
                 if app_search(line):
@@ -639,7 +640,9 @@ def fetch_real_name(app_dir, flavour):
             if app_found:
                 matches = name_search(line)
                 if matches:
-                    return retrieve_string(app_dir, matches.group(1)).strip()
+                    stringname = matches.group(1)
+                    logging.debug("fetch_real_name: using string " + stringname)
+                    return retrieve_string(app_dir, stringname).strip()
     return ''
 
 # Retrieve the version name