Исправление работы кэш

mhiretskiy
Mike khiretskiy 10 years ago
parent 056cde45bb
commit 053b4453b2

@ -1,9 +1,11 @@
AUX calculate-update-3.2.0_alpha1-r1.patch 683 SHA256 39edbee7b73bbb34d31ce88170e5624c956f99f2535346ae4572f5b293610485 SHA512 6a9f5dd2f66fe7cbd21073b676a29ae8bb8a5884822d2ddc99321637f4475aa1ed8eda10a7ee80b7bcab4bb711bc1d2d0d44f526ee300a0fda4e2a25c0ffafb3 WHIRLPOOL 3cceb6d5a53126d7cb14ca412b48985ed235f1de898e7e304fbb12b21deaa2c0934554b121fa165f2be1ec18443279c103d99f3f5e53c07d343da291132cb0f5
AUX calculate-update-3.2.0_alpha3-r1.patch 1506 SHA256 e02436a3f56d49eb96f4c3e9e53450dd93943d23ba4ff8b5d1b7332bc3fb03df SHA512 f237e2d3f72e236293d5e6eb4887be41a314ea0a16d5a4d29fe6179d957598743dc3e28e665c7ecdff66d2f8973dbeb7c9fc7c07a0da93db576446b2d8aefcbf WHIRLPOOL a7ac88f77218fbde7f8a2b50f60fbb647143b6c58f15cb376d163e885ce72fc24086f408eacb04fb1eda582ca6bba039b677c8532334fc95d642f4f20cac27e6
DIST calculate-update-3.2.0_alpha1.tar.bz2 14159 SHA256 6c5e73041029e93f04fe897447984c1f52f66f3486309d4e3bb741c0151dc44d SHA512 aac77b42e51f3be5f266bc3a7c233d2fa443b6316a7a618c61ef07be8e25704322bec6c39352184ee8fae227e4b2bbf276dfa038d4006be12079c71e983d16d4 WHIRLPOOL 8f395718c3332286ce47783fc42601f3dea9b9f7fd7225e5549ff8d04013a4d6a2208f103fde112b6ebf6791650a61aa5974dbfa435aecfd7d8e7b2d7ff9ae8b
DIST calculate-update-3.2.0_alpha2.tar.bz2 24294 SHA256 b626f371db8def2823f5f2a5081122a0746a9dae5f04bb1e38bc82c618d69042 SHA512 32e216097ad19444b16200082a8796a6a7a2d824310e271df51e931e73eef1b13a57cbe9b6eaeddd6bf4e8b0e3a3d3f4a41def509ed1c55a960a3df524afd472 WHIRLPOOL 7b241545ce18af117481a813b2b0b2d9450f0b638068867fc60d2a759f4345d50114459646f51f6972267586678149efc5f4c26f1090d8f1fa4485b3bc4b4d5f
DIST calculate-update-3.2.0_alpha3.tar.bz2 24313 SHA256 934f4b55f9df42090a128c524e2874b27f2e91b7f5b9c0eb2170ad8ee899362e SHA512 31c593b8d70592aa5f05011583317054c7bb75f558ae792cc3289820eaa87d85f4be91e29485c2aa824d1f2d7cbde942ed7f66fd9937d8950e59d83d41f6f7a2 WHIRLPOOL b995a3806cf7c964a26d979ad6c1416ec4b7315e79546c079c72c0ee12eb7dcc589198149186aba65ab860736389bfd9f0c3b534d88c97769d0ece5d8f013c1a
EBUILD calculate-update-3.2.0_alpha1-r1.ebuild 749 SHA256 59377f0c4bd1b0ab1a881a2c6ea8ed46717a709c84c07dcc1a07f161dc0b2259 SHA512 cbcbf5c5ebe2fe8e7f79b20f35f7ab5c26e48b1769c6bbffe73c41d73052627cc6eda7aed812c8bb94b98361ee0f04bf81381b6ecd3b81a52b6e8756e410b4d9 WHIRLPOOL ed5ac0355fa232190a75ec5daff8b2559435eceaac13ef3cf0a17a501eda4a264ae85e546de10cc0af42ac9b099dbe078b31c095cb7d42d4a5a8e9876b16c84e
EBUILD calculate-update-3.2.0_alpha1.ebuild 605 SHA256 bbba2cb38551fc98a0be4b262a9dacb7c37eb9459721dc4e7bfe59f54149330a SHA512 06ca411da63d5f8eb1dce23a908d5735dc760654a54b6246b373454f39c6966e8a46f2acf7c9f86c3b70cf3cd789459dac7757ac9c5747d1fc9bf85c09b850bb WHIRLPOOL cd2d5211ebe879bdee1af43446088700fbc5609c7c87ce25c3364a0c9a42942af9a1a8a11efcf1773217def31778d1139e491a6e771bb90b9b3f56a3e20ab570
EBUILD calculate-update-3.2.0_alpha2.ebuild 623 SHA256 e0fdd7f36ffb80057fe77efb72f8d3368a06015499449555a16fe1c4882802f2 SHA512 ea3e16087cb9c0446e151ad23072fc56195b54219760d7cdf49bf744cff68f12a5847e4dcdf42d90141049ab79262a260886c283038db130c8cfda29eb6bfdb4 WHIRLPOOL 710e53286c8754acaf2361b184279b999f1d67f95a747950ae91f5ed7be89375041cf097d0a227e4e78f6d17679f6b3f69d030486ce6dd5f6cb3cb687315707a
EBUILD calculate-update-3.2.0_alpha3-r1.ebuild 767 SHA256 30d51073f279718f20cd042265905b17ef4fe2a4f7bd98955caaa8d00922b75f SHA512 08b55eec3d280647f065d32e91b90a78a62f6c3a7786ee706c0b0e17c1194c1bb72d5c7d0c97305b919ea30cc0c5af10c6792bd8b36ab8b9a98bde8b6c8174b5 WHIRLPOOL b3523ffd53edc3a09a9de35f1b4856a2874146f0a409a9fc51467c4a32523e84277b0159633bcf7857080897d5016de3bb27b3d44ca3b5d0d81c903e02d09c7b
EBUILD calculate-update-3.2.0_alpha3.ebuild 623 SHA256 9747a7f19c9cd545b38f74f283a1c7aecb451bc1769a833935217cfe53b01baa SHA512 c2910b1427589e6fa869840d15dcd3149c84da02d5a6f09a1f1ac23c8702a4efaf0bbbd778057395217e7e70c20eb6a1716e933710719669c9236fa9ca3c4c3a WHIRLPOOL aaae73a86f00e62990528e9a01e5f9f41c57f38a4407452433362189fddd3c5230ce69016c93ffb4e5f0694e1c811d6e9c2f631f854422d1195021c656fa9292
EBUILD calculate-update-3.2.9999.ebuild 530 SHA256 9558d49a6b95f73c67f79c835e4003725ba7ae7e0492ea336737da16fe2f5005 SHA512 466bce621f4073bfbf4d34063cbb54077910baa5e40637d5d8d23044edccc9d79bb764db25e05b68969f1bd63573a1c0bc04676f45a6bbeca173503df6887767 WHIRLPOOL 0107e9b7746739a9be77664aa9e6907c9e511ac0422721d709fe63ffb4a55246a2d6c494280bd3b72e50d8e1aecb7f811cfdd112c482168bd9fa17c4ff0d5eaf

@ -0,0 +1,33 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of update Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.2.0_alpha3
~sys-apps/calculate-install-3.2.0_alpha3
dev-python/pexpect"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-update-3.2.0_alpha3-r1.patch"
}

@ -0,0 +1,36 @@
diff --git update/emerge_parser.py update/emerge_parser.py
index c19450f..21b12b6 100644
--- update/emerge_parser.py
+++ update/emerge_parser.py
@@ -550,8 +550,7 @@ class EmergeCache(object):
# список файлов проверяемый по mtime на изменения
check_list = [MtimeCheckvalue('/etc/make.conf',
'/etc/portage',
- '/etc/make.profile',
- '/var/cache/edb/binhost')]
+ '/etc/make.profile')]
def __init__(self):
self.files_control_values = {}
diff --git update/update.py update/update.py
index fbb6782..36b4e1c 100644
--- update/update.py
+++ update/update.py
@@ -384,7 +384,7 @@ class Update:
raise EmergeError(_("File %s not found" % filename))
return self.child
- param, packages = self.getCacheOnWorld(param, packages)
+ param, packages = self.getCacheOnWorld(param, packages, check=True)
param = [param, "-pv"]
#print "PREMERGE",packages,param
@@ -438,7 +438,7 @@ class Update:
raise EmergeError(_("File %s not found" % filename))
return self.child
- param, packages = self.getCacheOnWorld(param, packages, check=True)
+ param, packages = self.getCacheOnWorld(param, packages)
#print "EMERGE",packages,param
ask_emerge = self.clVars.Get('cl_update_precheck_set') == 'off'
with EmergeParser(EmergeCommand(list(packages),

@ -1,5 +1,6 @@
EBUILD calculate-utilities-3.2.0_alpha1-r1.ebuild 823 SHA256 2b50e40a1ffe5e903a7a6f5593afa525d40e4c9779b1d251369762d696a0f2c4 SHA512 ed74da8b3492170fd565cf175495c3e2ed4f33e81cc3b96aca45713551ad2058264e7b58a9bc03f6573f2d1fe89de14b7de6f878dccf689e7944a8bf4a65bb8e WHIRLPOOL 818629c905836836820df45db67df657be07610a40c7ab034003eba5ce373c45b98e1ddf9256ac59ff2a2672485da0b62793c7dd43323306063bd8dedc83048e
EBUILD calculate-utilities-3.2.0_alpha1.ebuild 814 SHA256 8bfda4f720daefebbdb87be5d078e7fe4e03042e0e1ddf30c907925f48c10c50 SHA512 0948e70dc1cff058f2523aab3e43ff74704128face7db74381dc014c05f628b57c2baa5531b19bb9a335198ed47904e649b724d46214bad0e069b1283256fbbf WHIRLPOOL 0d3d84b220e813e0b979d70513e75ba10605d289b65df41eb4f73b5449b271cd4f3343088e8e1696615aca5244b23e09013e89a26c6624925288edc47fd1368e
EBUILD calculate-utilities-3.2.0_alpha2.ebuild 812 SHA256 ecaf29e49f955fe030e4926548a88218c90c4eb19dcec9dd8dfe2be2d7484628 SHA512 f4c637c64742e0b02bb311a4a1cb176832f41142d086bd2327d6cafcba35881661a950cb7880aaf7870b48650aaa9166652652a1c366e7ad72cf848dc8d625b4 WHIRLPOOL 4b6f3ed657610e5995556fbb7482a63443bd0df51ad6cdbde795cc577f73bcea91a890268d3637205e56fed0500508737763dc69cff5cbf420deaf34de4e946c
EBUILD calculate-utilities-3.2.0_alpha3-r1.ebuild 815 SHA256 d979d77520dc609ec65f9474d4bc59d983af0e8e22ea786818c85b0b78e9c51b SHA512 8ef15428e292abf22ec2ad210b20e94aa38e485270437eb0ffdd19ed8e047647fdfa1c365b068853e147e9f5eee2b966efcf9a38dc1840aa4846134a512c27fe WHIRLPOOL 04f2fff91652552075617ccf1ad82fcb3b1cb8796649c55a2a0058043a16dc75dafde3bdd394869da3772976bf4398801bb15c19c3ea50c4e5d5d39301e92f2b
EBUILD calculate-utilities-3.2.0_alpha3.ebuild 812 SHA256 7aa150fabd4171e2dd45f6892b0596ad7bf3394c629b6f3f383b8c5fd8bf86b7 SHA512 34f08c147d7b3d3f8164ab3d21fdc5ca1e2f82c2a6880a3b93f7ab0771d8b874ed388b311148e69bb9cf4d716542f3d98dbbed7c38422a5b4739299fad5897b0 WHIRLPOOL 20deaa70b41be90e1e1b3d6e54117e6ca26fa394b155d3f3ab4d2d5c617467ce58b76762e31b71f73a969bab361924127832ec2b790c397bedd5045baf20cd1c
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.2.0_alpha3
=sys-apps/calculate-i18n-3.2.0_alpha3
=sys-apps/calculate-lib-3.2.0_alpha3
=sys-apps/calculate-core-3.2.0_alpha3
=sys-apps/calculate-update-3.2.0_alpha3-r1
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha3 )
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha3 )
"
Loading…
Cancel
Save