Bläddra i källkod

Исправлен вызов update_layman

tags/3.6.0_beta7
förälder
incheckning
5a20e18d5e
2 ändrade filer med 3 tillägg och 5 borttagningar
  1. +2
    -4
      pym/update/update.py
  2. +1
    -1
      pym/update/utils/cl_update.py

+ 2
- 4
pym/update/update.py Visa fil

@@ -1390,8 +1390,6 @@ class Update(MethodsInterface):
pi["TTL"] = str(30 * DAYS)
pi["DOWNLOAD_TIMESTAMP"] = str(int(time.time()))
pi.write(f)
with writeFile("/tmp/Packages.org") as f:
f.write(orig_packages)
except (OSError, IOError):
raise UpdateError(_("Failed to save Packages"))
self.endTask(True)
@@ -1606,7 +1604,7 @@ class Update(MethodsInterface):
self.endTask()
return True

def update_layman(self, chroot_path):
def update_layman(self):
"""
Обновить базу layman
:param builder_path:
@@ -1616,6 +1614,6 @@ class Update(MethodsInterface):
cmd_path = self.get_prog_path(cmd)
if not cmd_path:
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()
return layman.success()

+ 1
- 1
pym/update/utils/cl_update.py Visa fil

@@ -143,7 +143,7 @@ def get_synchronization_tasks(object_name):
},
{'name': 'update_layman',
'message': __("Layman cache update"),
'method': "Update.update_layman()",
'method': Object('update_layman()'),
'condition': lambda Get: isPkgInstalled(
"app-portage/layman", prefix=Get('cl_chroot_path')),
'essential': False,


Laddar…
Avbryt
Spara