support logo file in pkg root dir (#164)

TencentBlueKing · Dec 25, 2019 · c99deac · c99deac
1 parent 5cf6cf5
commit c99deac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/paas-ce/paas/paas/saas/utils.py b/paas-ce/paas/paas/saas/utils.py
@@ -94,7 +94,8 @@ def extract_logo_file(filename, path, saas_app_code):
     def match_func(name):
         if not isinstance(name, unicode):
             name = name.decode("utf-8")
-        return name.endswith(app_logo_name) and len(name.split("/")) == 3
+        # support logo file in x/{app_code}.png or x/src/{app_code}.png
+        return name.endswith(app_logo_name) and (len(name.split("/")) in (2, 3))
 
     ok, message, content = _get_file_from_tar_file(filename, path, match_func)
     if not ok: