Merge pull request #5322 from benjaoming/well-known-contentpack-filen…

…ame-patterns More filename patterns for contentpack preseeding
learningequality · Oct 7, 2016 · 908070e · 908070e
2 parents e4bd996 + 2a186a9
commit 908070e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/kalite/distributed/management/commands/setup.py b/kalite/distributed/management/commands/setup.py
@@ -43,7 +43,11 @@
     version=SHORTVERSION, langcode="en", suffix="")
 
 PRESEED_DIR = os.path.join(ROOT_DATA_PATH, "preseed")
-PRESEED_CONTENT_PACK_MASK = re.compile(r"contentpack\.(?P<lang>[a-z]{2,}).zip")
+
+# Examples:
+# contentpack.en.zip
+# contentpack-0.16.en.zip
+PRESEED_CONTENT_PACK_MASK = re.compile(r"contentpack.*\.(?P<lang>[a-z]{2,}).zip")
 
 
 def raw_input_yn(prompt):