openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adjust log

This commit is contained in:
shenyafeng 2022-10-21 17:08:20 +08:00
parent 8a56efcee7
commit 60b501dd9b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unattended-upgrades/kylin-unattended-upgrade
View File

@ -610,6 +610,7 @@ class KylinSystemUpdater:
def ConnectToSignals(self):
def update_detect_finished_handler(success,updatelist,error_status,error_cause):
logging.debug(updatelist)
if success:
logging.info("update detect success,quiting main loop")
self.update_group = updatelist
@ -1032,7 +1033,7 @@ class UnattendedUpgradesCache(apt.Cache):
def adjust_candidate_with_version(self,pkg,version):
for v in pkg.versions:
if v.version == version and is_in_allowed_origin(v,self.allowed_origins):
logging.debug("pkg %s adjusting candidate version: %s" %(pkg.name,v))
#logging.debug("pkg %s adjusting candidate version: %s" %(pkg.name,v))
pkg.candidate = v
return True
return False

7
unattended-upgrades/kylin-unattended-upgrade-shutdown
View File

@ -967,12 +967,13 @@ class UnattendedUpgradesShutdown():
logging.debug("Skip waiting for signals, starting operation "
"now")
# self.start_iterations()
'''
if os_release_info['PROJECT_CODENAME'] == 'V10SP1-edu' and os_release_info['SUB_PROJECT_CODENAME']=='mavis':
logging.info("setting startup download timer")
GLib.timeout_add(300*1000, lambda: self.timing_download() and False)
#local_time =time.localtime(time.time()+300)
self.startup_download_job = self.scheduler.add_job(self.timing_download,'cron',hour=self.download_time_r['h'],minute = self.download_time_r['m'])
else:
if self.autoUpgrade == FeatureSwitch.ON.value:
logging.debug("download time:[%d:%d] install time:[%d:%d]", self.download_time_r['h'], self.download_time_r['m'],self.install_time_r['h'],self.install_time_r['m'])
@ -980,8 +981,8 @@ class UnattendedUpgradesShutdown():
self.install_job = self.scheduler.add_job(self.timing_install, 'cron', hour=self.install_time_r['h'], minute=self.install_time_r['m'])
elif self.autoUpgrade == FeatureSwitch.OFF.value:
logging.info("auto upgrade turned off")
TimerThread(self.scheduler).start()
'''
#TimerThread(self.scheduler).start()
self.mainloop.run()
logging.info("quit mainloop")
os._exit(0)