[apparmor] [patch] [utils] Fix make check failure due to raw_input in ui.py

[Kshitij Gupta]

Hello,

On Sat, Nov 15, 2014 at 3:24 AM, Steve Beattie <steve at nxnw.org> wrote:

> On Thu, Oct 16, 2014 at 04:21:08PM +0530, Kshitij Gupta wrote:
> > On Sat, Oct 11, 2014 at 3:04 AM, Steve Beattie <steve at nxnw.org> 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
>
>
> 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>
>
> Thanks.

Commited and pushed.

Regards,

Kshitij Gupta

> --
> Steve Beattie
> <sbeattie at ubuntu.com>
> http://NxNW.org/~steve/
>
> --
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/apparmor
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20141117/ac8bbb9d/attachment.html>