Маркер времени запуска проверки на обновление перемещен в ini.env

master3.3
Mike Khiretskiy 10 years ago
parent 236f78176b
commit ec254483f3

@ -178,7 +178,7 @@ class Update:
if not status: if not status:
self.printWARNING(_("Updates autocheck is not enabled")) self.printWARNING(_("Updates autocheck is not enabled"))
return False return False
line = EmergeLog(EmergeLogNamedTask("schedule")).get_last_time() last_check = SystemIni().getVar('update', 'last_check') or ""
re_interval = re.compile("^(\d+)\s*(hours?|days?|weeks?)?", re.I) re_interval = re.compile("^(\d+)\s*(hours?|days?|weeks?)?", re.I)
interval_match = re_interval.search(interval) interval_match = re_interval.search(interval)
MINUTE = 60 MINUTE = 60
@ -194,10 +194,9 @@ class Update:
est = int(interval_match.group(1)) * k est = int(interval_match.group(1)) * k
else: else:
est = 3 * HOUR est = 3 * HOUR
if line: if last_check:
linetime = line.partition(":")[0] if last_check.isdigit():
if linetime.isdigit(): if (time.time() - int(last_check)) < (est - 10 * MINUTE):
if (time.time() - int(linetime)) < (est - 10 * MINUTE):
self.printWARNING(_("Please wait for the update time")) self.printWARNING(_("Please wait for the update time"))
return False return False
self.mark_schedule() self.mark_schedule()
@ -691,10 +690,10 @@ class Update:
elog.mark_end_task(), elog.mark_end_task(),
def mark_schedule(self): def mark_schedule(self):
from calculate.update.utils.cl_update import ClUpdateAction """
elog = EmergeLog( Установить отметку о запуске запланированной проверки
EmergeLogNamedTask(ClUpdateAction.log_names['schedule'])) """
elog.mark_end_task(), SystemIni().setVar('update', {'last_check': str(int(time.time()))})
def premerge(self, param, *packages): def premerge(self, param, *packages):
""" """

Loading…
Cancel
Save