[apparmor] [patch] [utils] Fix make check failure due to raw_input in ui.py
Christian Boltz
apparmor at cboltz.de
Fri Nov 14 23:16:48 UTC 2014
Hello,
Am Freitag, 14. November 2014 schrieb Steve Beattie:
> On Thu, Oct 16, 2014 at 04:21:08PM +0530, Kshitij Gupta wrote:
> > On Sat, Oct 11, 2014 at 3:04 AM, Steve Beattie wrote:
> > > Part of the reason for a lack of urgency in responding to this
> > > issue is that I'm not seeing this failure locally. I'm guessing
> > > that you're seeing a pyflakes failure when running make check? I
> > > wonder if this is due to running an out of date pyflakes?
> > >
> > > I *do* see a current failure with pyflakes 0.5.0 (as packaged in
> > > ubuntu>
> > > 12.04 LTS) when running make check:
> > Indeed, the issue was due to me running an older version of pyflakes
> > which caused the make check to fail.
> >
> > Updating pyflakes fixed it.
> >
> > Hence, this patch is not required.
>
> I'd like to resurrect Kshitij's patch, as I'm proposing the following
> patch to support alternate versions of pyflakes:
>
> Signed-off-by: Steve Beattie <steve at nxnw.org>
> ---
> utils/Makefile | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> Index: b/utils/Makefile
> ===================================================================
> --- a/utils/Makefile
> +++ b/utils/Makefile
> @@ -40,6 +40,8 @@ BINDIR=${DESTDIR}/usr/sbin
> CONFDIR=${DESTDIR}/etc/apparmor
> PYPREFIX=/usr
>
> +PYFLAKES=pyflakes
> +
> po/${NAME}.pot: ${TOOLS} ${PYMODULES}
> $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${TOOLS}
> ${PYMODULES}"
>
> @@ -92,7 +94,7 @@ check: check_severity_db check_pod_files
> done
> for i in ${PYTOOLS} apparmor test/*.py; do \
> echo Checking $$i; \
> - pyflakes $$i || exit 1; \
> + $(PYFLAKES) $$i || exit 1; \
> done
> $(MAKE) -C test check
> $(MAKE) -C vim check
Good idea.
Acked-by: Christian Boltz <apparmor at cboltz.de>
> and when using pyflakes3 (via 'make check PYFLAKES=pyflakes3'), I get
> the same failure on raw_input that Kshitij was seeing on the older
> version of pyflakes. So for Kshitij's patch:
>
> Acked-by: Steve Beattie <steve at nxnw.org>
AFAIK Kshitij is currently busy with exams etc. so you might want to
commit his patch yourself.
Regards,
Christian Boltz
--
[Maus] Arrrgl, ich HASSE Scrollräder.
Ich habe schon überlegt, ob ich es festklebe.
Fürs erste reicht es aber, nicht den IMPS/2-Treiber zu nehmen, dann ist
es wenigstens funktionslos. Weitere Gedanken dazu sind nicht jugendfrei.
[Ratti in fontlinge-devel]
More information about the AppArmor
mailing list