移除标记

backend/SystemUpdater/Core/Database.py

@@ -249,6 +249,8 @@ class Sqlite3Server(object):
                         pkgversion = str(pkgversion).split('=')[-1]
                     logging.info("Complete system upgrade, refresh system version ...")
                     self._refresh_system_version(pkgversion)
+                    #移除step-two标记
+                    self._removal_of_marker()
 
                 #FIXME: 临时方案 PHP
                 PHPSeverSend(_appname=pkgname, _appversion=pkgversion, _statue=status, _errorcode="10000100", _errorstring=errstr)
@@ -401,6 +403,8 @@ class Sqlite3Server(object):
                         pkgversion = str(pkgversion).split('=')[-1]
                     logging.info("Complete system upgrade, refresh system version ...")
                     self._refresh_system_version(str(pkgversion))
+                    #移除step-two标记
+                    self._removal_of_marker()
 
         elif mode == InstallBackend.MODE_INSTALL_SYSTEM: # 全盘升级
             self.insert_into_updateinfo(_("Upgrade System"), "", "This is a complete system upgrade, equivalent to the implementation of apt dist-upgrade", timestr, status, "1", errstr, str("全盘升级"), status_cn, " ")
@@ -409,6 +413,8 @@ class Sqlite3Server(object):
             if status == "success":
                 # 更新版本号
                 self._refresh_system_version(pseudo_version=True)
+                #移除step-two标记
+                self._removal_of_marker()
         else:
             logging.warning("Cache is None.")
 
@@ -455,6 +461,18 @@ class Sqlite3Server(object):
                     pass
         return pkgs_install,pkgs_upgrade,pkgs_remove
 
+    def _removal_of_marker(self):
+        try:
+            marker_path = "/var/cache/kylin-update-manager/ignoreOrDelay"
+            if os.path.exists(marker_path):
+                with open(marker_path, 'r+') as f:
+                    line= f.readline()
+                    if "2107" in line or "2203" in line:
+                        f.seek(0)
+                        f.truncate()
+        except Exception as e:
+            logging.error("Removing the upgrade success mark error: %s.",str(e))
+
     # #查找数据库
     # def find_msg_from_datebase(self, table, field, action = 'check', cid = 0):
     #     # 查询数据