Browse Source

Поддержка gentoo названия для /usr/portage

tags/3.4.5.9
parent
commit
1039fca5ec
2 changed files with 6 additions and 5 deletions
  1. +4
    -4
      pym/update/update.py
  2. +2
    -1
      pym/update/variables/update.py

+ 4
- 4
pym/update/update.py View File

@@ -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):


+ 2
- 1
pym/update/variables/update.py View File

@@ -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):


Loading…
Cancel
Save