parent
b8cf895a36
commit
78b15458ce
@ -1 +0,0 @@
|
||||
# Calculate append=skip
|
||||
@ -1 +0,0 @@
|
||||
# Calculate mergepkg()=>3.3,4 path=/usr/lib/python2.7/site-packages
|
||||
@ -1,20 +0,0 @@
|
||||
# Calculate format=diff
|
||||
index cace43b..ab2acaf 100644
|
||||
--- /usr/lib/python2.7/site-packages/pexpect/__init__.py
|
||||
+++ /usr/lib/python2.7/site-packages/pexpect/__init__.py
|
||||
@@ -490,10 +490,13 @@ class spawn(object):
|
||||
# inherit EOF and INTR definitions from controlling process.
|
||||
try:
|
||||
from termios import VEOF, VINTR
|
||||
- fd = sys.__stdin__.fileno()
|
||||
+ try:
|
||||
+ fd = sys.__stdin__.fileno()
|
||||
+ except ValueError:
|
||||
+ fd = sys.__stdout__.fileno()
|
||||
self._INTR = ord(termios.tcgetattr(fd)[6][VINTR])
|
||||
self._EOF = ord(termios.tcgetattr(fd)[6][VEOF])
|
||||
- except (ImportError, OSError, IOError, termios.error):
|
||||
+ except (ImportError, OSError, ValueError, IOError, termios.error):
|
||||
# unless the controlling process is also not a terminal,
|
||||
# such as cron(1). Fall-back to using CEOF and CINTR.
|
||||
try:
|
||||
@ -1,52 +0,0 @@
|
||||
# Calculate format=diff pkg(sys-apps/calculate-utils)<3.4.1
|
||||
Поддержка названия gentoo для /usr/portage
|
||||
|
||||
--- /usr/lib/python2.7/site-packages/calculate/builder/builder.py
|
||||
+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py
|
||||
@@ -149,7 +149,7 @@ class Builder(Update):
|
||||
self.clVars.Get('update.cl_update_layman_make'),
|
||||
self.clVars.Get('update.cl_update_layman_conf'),
|
||||
prefix=self.clVars.Get('cl_builder_path'))
|
||||
- if repname != "portage":
|
||||
+ if repname not in ("portage", "gentoo"):
|
||||
layman.remove(repname, rpath_orig)
|
||||
removeDir(rpath)
|
||||
return True
|
||||
--- /usr/lib/python2.7/site-packages/calculate/update/update.py
|
||||
+++ /usr/lib/python2.7/site-packages/calculate/update/update.py
|
||||
@@ -293,7 +293,7 @@ class Update(object):
|
||||
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):
|
||||
@@ -328,7 +328,7 @@ class Update(object):
|
||||
dv.Get('cl_update_layman_make'),
|
||||
dv.Get('cl_update_layman_conf'),
|
||||
prefix=chroot_path)
|
||||
- if repname != "portage":
|
||||
+ if repname not in ("portage", "gentoo"):
|
||||
# TODO: debug block
|
||||
#print "EEEE",repname, url, rpath_orig
|
||||
layman.add(repname, url, rpath_orig)
|
||||
@@ -340,7 +340,7 @@ class Update(object):
|
||||
"""
|
||||
Спрятать кэш
|
||||
"""
|
||||
- if name in ("portage",):
|
||||
+ if name in ("portage", "gentoo"):
|
||||
return
|
||||
if not name in OverlayOwnCache(self.clVars):
|
||||
for cachename in self.metadata_cache_names:
|
||||
@@ -360,7 +360,7 @@ class Update(object):
|
||||
"""
|
||||
Извлеч кэш
|
||||
"""
|
||||
- if name in ("portage",):
|
||||
+ if name in ("portage", "gentoo"):
|
||||
return
|
||||
cachenames = self.metadata_cache_names
|
||||
if not name in OverlayOwnCache(self.clVars):
|
||||
@ -1,66 +0,0 @@
|
||||
# Calculate format=diff pkg(sys-apps/calculate-utils)==3.4.1,3.4.5.28
|
||||
Поддержка названия gentoo для /usr/portage
|
||||
|
||||
--- /usr/lib/python2.7/site-packages/calculate/builder/builder.py
|
||||
+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py
|
||||
@@ -162,7 +162,7 @@ class Builder(Update):
|
||||
self.clVars.Get('update.cl_update_layman_make'),
|
||||
self.clVars.Get('update.cl_update_layman_conf'),
|
||||
prefix=self.clVars.Get('cl_builder_path'))
|
||||
- if repname != "portage":
|
||||
+ if repname not in ("gentoo", "portage"):
|
||||
layman.remove(repname, rpath_orig)
|
||||
removeDir(rpath)
|
||||
return True
|
||||
--- /usr/lib/python2.7/site-packages/calculate/update/update.py
|
||||
+++ /usr/lib/python2.7/site-packages/calculate/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
|
||||
--- /usr/lib/python2.7/site-packages/calculate/update/variables/update.py
|
||||
+++ /usr/lib/python2.7/site-packages/calculate/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):
|
||||
Loading…
Reference in new issue