Merge branch 'backend_manual' into 'backend_uu'

Backend manual

See merge request kylin-desktop/update-manager-group/kylin-system-updater!469

backend/SystemUpdater/Core/OriginFilter.py

@@ -253,6 +253,7 @@ class OriginProperty():
     def analytic_properties(self, local_sourcelist):
         http_origin = {"component":[],"release":{}}
         ftp_orgin   = {"component":[],"release":{}}
+        dist_list = []
         # 经过解析后的本地源，获取所有的分发属性
         for ls in local_sourcelist['http']:
             for item in filter(not_empty, ls['sources'].split(' ')):
@@ -261,7 +262,9 @@ class OriginProperty():
                 elif "http" in item:
                     http_origin['origin_source']   = item
                 elif "/" in item:
-                    http_origin['dist'] = item.split("/")[0]
+                    dist_list = item.split("/")
+                    dist_list.pop()
+                    http_origin['dist'] = "/".join(dist_list)
                     http_origin['component'].append(item.split("/")[1])
                 elif item not in ARCHITECTUREMAP and item != "Packages":
                     http_origin['component'].append(item)

backend/po/zh_CN.po

@@ -2639,10 +2639,10 @@ msgid "Check for update exceptions,fix system APT environment error."
 msgstr "检查更新异常，修复系统APT环境出现错误。"
 
 msgid "The system APT environment is abnormal, please check the system APT environment."
-msgstr "系统APT环境异常，请检查系统APT环境。"
+msgstr "修复系统APT环境异常，请检查系统APT环境。"
 
 msgid "Priority upgrade status exception."
-msgstr "优先升级异常。"
+msgstr "优先升级状态异常。"
 
 msgid "Upgrade configuration acquisition exception."
 msgstr "升级配置获取异常。"

backend/report-updater-bug

@@ -19,6 +19,7 @@ cp /etc/apt/sources.list updaterlog || true
 cp -r /etc/apt/sources.list.d/ updaterlog || true
 cp -r /etc/apt/apt.conf.d/ updaterlog || true
 
+cp -r /usr/share/kylin-update-desktop-config/config/ updaterlog || true
 #复制后端的日志
 cp -r /var/log/kylin-system-updater/ updaterlog || true