Gentoo Archives: gentoo-portage-dev

From: Brian Dolbec <dolsen@g.o>
To: gentoo-portage-dev@l.g.o
Subject: Re: [gentoo-portage-dev] [PATCH] actions.py: fix missing localization import (bug 541302)
Date: Wed, 25 Feb 2015 07:37:24
Message-Id: 20150224233717.511a710f.dolsen@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH] actions.py: fix missing localization import (bug 541302) by Zac Medico
1 On Tue, 24 Feb 2015 22:32:05 -0800
2 Zac Medico <zmedico@g.o> wrote:
3
4 > Since commit 206efe5f6341bce99a5e9994a0458c304513b2c3,
5 > FEATURES=buildpkg triggers a NameError due to a missing localization
6 > import. Fix the NameError, and also allow read-only PKGDIR if the
7 > --usepkgonly option is enabled.
8 >
9 > Fixes: 206efe5f6341 ("emerge: check for writable PKGDIR (490732)")
10 > X-Gentoo-Bug: 541302
11 > X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541302
12 > ---
13 > pym/_emerge/actions.py | 4 +++-
14 > 1 file changed, 3 insertions(+), 1 deletion(-)
15 >
16 > diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
17 > index fa4fe19..b667537 100644
18 > --- a/pym/_emerge/actions.py
19 > +++ b/pym/_emerge/actions.py
20 > @@ -63,6 +63,7 @@ from portage.util._async.SchedulerInterface import
21 > SchedulerInterface from portage.util._eventloop.global_event_loop
22 > import global_event_loop from portage._global_updates import
23 > _global_updates from portage.sync.old_tree_timestamp import
24 > old_tree_timestamp_warn +from portage.localization import _
25 > from portage.metadata import action_metadata
26 >
27 > from _emerge.clear_caches import clear_caches
28 > @@ -433,7 +434,8 @@ def action_build(settings, trees, mtimedb,
29 > _opts_no_self_update.intersection(myopts)
30 >
31 > need_write_bindb = not any(x in myopts for x in
32 > - ("--fetchonly", "--fetch-all-uri",
33 > "--pretend")) and \
34 > + ("--fetchonly", "--fetch-all-uri",
35 > + "--pretend", "--usepkgonly")) and \
36 > (any("buildpkg" in
37 > trees[eroot]["root_config"]. settings.features for eroot in trees) or
38 > any("buildsyspkg" in
39 > trees[eroot]["root_config"].
40
41 LGTM
42
43 --
44 Brian Dolbec <dolsen>