From: Hans-Christoph Steiner Date: Fri, 14 Apr 2017 22:17:09 +0000 (+0200) Subject: update: fix glob to actually match all locales X-Git-Tag: 0.8~74^2~1 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fd21d68bc1ee7d4c555805cc7bb605a99e51eee9;p=fdroidserver.git update: fix glob to actually match all locales glob != regexp, [A-Z-.@] means one of those chars is required in that position, so the glob pattern was requiring a least 3 chars. Locales are usually just two lower case letters, e.g. vi, de, ar. --- diff --git a/fdroidserver/update.py b/fdroidserver/update.py index f4480ec1..a97a40bf 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -693,8 +693,8 @@ def insert_localized_app_metadata(apps): """ - sourcedirs = glob.glob(os.path.join('build', '[A-Za-z]*', 'fastlane', 'metadata', 'android', '[a-z][a-z][A-Z-.@]*')) - sourcedirs += glob.glob(os.path.join('metadata', '[A-Za-z]*', '[a-z][a-z][A-Z-.@]*')) + sourcedirs = glob.glob(os.path.join('build', '[A-Za-z]*', 'fastlane', 'metadata', 'android', '[a-z][a-z]*')) + sourcedirs += glob.glob(os.path.join('metadata', '[A-Za-z]*', '[a-z][a-z]*')) for d in sorted(sourcedirs): if not os.path.isdir(d):