|
|
@ -1390,8 +1390,6 @@ class Update(MethodsInterface):
|
|
|
|
pi["TTL"] = str(30 * DAYS)
|
|
|
|
pi["TTL"] = str(30 * DAYS)
|
|
|
|
pi["DOWNLOAD_TIMESTAMP"] = str(int(time.time()))
|
|
|
|
pi["DOWNLOAD_TIMESTAMP"] = str(int(time.time()))
|
|
|
|
pi.write(f)
|
|
|
|
pi.write(f)
|
|
|
|
with writeFile("/tmp/Packages.org") as f:
|
|
|
|
|
|
|
|
f.write(orig_packages)
|
|
|
|
|
|
|
|
except (OSError, IOError):
|
|
|
|
except (OSError, IOError):
|
|
|
|
raise UpdateError(_("Failed to save Packages"))
|
|
|
|
raise UpdateError(_("Failed to save Packages"))
|
|
|
|
self.endTask(True)
|
|
|
|
self.endTask(True)
|
|
|
@ -1606,7 +1604,7 @@ class Update(MethodsInterface):
|
|
|
|
self.endTask()
|
|
|
|
self.endTask()
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def update_layman(self, chroot_path):
|
|
|
|
def update_layman(self):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Обновить базу layman
|
|
|
|
Обновить базу layman
|
|
|
|
:param builder_path:
|
|
|
|
:param builder_path:
|
|
|
@ -1616,6 +1614,6 @@ class Update(MethodsInterface):
|
|
|
|
cmd_path = self.get_prog_path(cmd)
|
|
|
|
cmd_path = self.get_prog_path(cmd)
|
|
|
|
if not cmd_path:
|
|
|
|
if not cmd_path:
|
|
|
|
raise UpdateError(_("Failed to find the %s command") % cmd)
|
|
|
|
raise UpdateError(_("Failed to find the %s command") % cmd)
|
|
|
|
layman = CommandExecutor(cmd_path, ["-f"], logfile=logfile)
|
|
|
|
layman = emerge_parser.CommandExecutor(cmd_path, ["-f"])
|
|
|
|
layman.execute()
|
|
|
|
layman.execute()
|
|
|
|
return layman.success()
|
|
|
|
return layman.success()
|
|
|
|