From 1039fca5ec740b2049e57e3badef96cacc7c3df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 4 Mar 2016 17:03:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20gentoo=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20/usr/portage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/update.py | 8 ++++---- pym/update/variables/update.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 8807690..7c9a4b2 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -328,7 +328,7 @@ class Update(MethodsInterface): dv.Get('cl_update_layman_make'), dv.Get('cl_update_layman_conf'), prefix=chroot_path) - if repname != "portage": + if repname not in ("portage", "gentoo"): layman.add(repname, url, rpath_orig) if not self._syncRepository(repname, url, rpath, revision, cb_progress=self.setProgress, @@ -367,7 +367,7 @@ class Update(MethodsInterface): dv.Get('cl_update_layman_make'), dv.Get('cl_update_layman_conf'), prefix=chroot_path) - if repname != "portage": + if repname not in ("portage", "gentoo"): layman.add(repname, url, rpath_orig) finally: mtime.restore() @@ -379,7 +379,7 @@ class Update(MethodsInterface): """ Спрятать кэш """ - if name in ("portage",): + if name in ("portage", "gentoo"): return if not name in OverlayOwnCache(self.clVars): for cachename in self.metadata_cache_names: @@ -399,7 +399,7 @@ class Update(MethodsInterface): """ Извлеч кэш """ - if name in ("portage",): + if name in ("portage", "gentoo"): return cachenames = self.metadata_cache_names if not name in OverlayOwnCache(self.clVars): diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index 35bd04a..e40a112 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -470,7 +470,8 @@ class VariableClUpdateSyncOverlayRep(ReadonlyVariable): type = "list" def get(self): - return filter(lambda x: x != "portage", self.Get('cl_update_sync_rep')) + return filter(lambda x: x not in ("portage", "gentoo"), + self.Get('cl_update_sync_rep')) class VariableClUpdateOutdateSet(ReadonlyVariable):