diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-07-23 13:02:42 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-07-23 13:09:18 -0700 |
| commit | 2a11e6079130d61d8d8297215ffea32e2743cbd0 (patch) | |
| tree | c6ef5d3ffc54665f025ffb69af2e2c07529257e4 | |
| parent | profiles/package.mask: drop mask on spidermonkey:52 and polkit-0.114 (diff) | |
| download | gentoo-2a11e6079130d61d8d8297215ffea32e2743cbd0.tar.gz gentoo-2a11e6079130d61d8d8297215ffea32e2743cbd0.tar.bz2 gentoo-2a11e6079130d61d8d8297215ffea32e2743cbd0.zip | |
sys-apps/portage: revbump to 2.3.43-r1
#661834 - synced files owned by root
#661906 - git sync continues despite key refresh failure
Bug: https://bugs.gentoo.org/661834
Bug: https://bugs.gentoo.org/661906
Package-Manager: Portage-2.3.43, Repoman-2.3.10
| -rw-r--r-- | sys-apps/portage/portage-2.3.43-r1.ebuild (renamed from sys-apps/portage/portage-2.3.43.ebuild) | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys-apps/portage/portage-2.3.43.ebuild b/sys-apps/portage/portage-2.3.43-r1.ebuild index 4afb116e9521..54096df31b3b 100644 --- a/sys-apps/portage/portage-2.3.43.ebuild +++ b/sys-apps/portage/portage-2.3.43-r1.ebuild @@ -99,6 +99,14 @@ python_prepare_all() { sed -e 's|\(def call_.*,*args\)):$|\1, **kwargs):|' \ -i pym/portage/util/_eventloop/EventLoop.py || die + # Apply dc1ba7729c42 and de9801740fcb for bug 661906. + sed -e 's|^\( return \)(1, False)|\1False|' \ + -i pym/portage/sync/modules/git/git.py || die + + # Apply e356d53ceb10 for bug 661834. + sed -e 's|subprocess.call(rsynccommand)|portage.process.spawn(rsynccommand, **self.spawn_kwargs)|' \ + -i pym/portage/sync/modules/rsync/rsync.py || die + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |