Re: ✘Python 2.7 broken

[James Browning]

On Sat, Dec 12, 2020 at 6:16 PM Gary E. Miller via devel <devel at ntpsec.org>
wrote:

> Yo James!
>
> On Sat, 12 Dec 2020 18:04:57 -0800
> James Browning via devel <devel at ntpsec.org> wrote:
>
> > It looks like a4c2c7921f144674402c2a3dbfc13a87b1ea3d1f can you
> > confirm?
>
> Confirmed.
>

The following patch clears it up on the machine I bisected on.

diff --git a/wafhelpers/bin_test.py b/wafhelpers/bin_test.py
index 8501ef6fc..9c06b63fc 100644
--- a/wafhelpers/bin_test.py
+++ b/wafhelpers/bin_test.py
@@ -105,7 +105,7 @@ def cmd_bin_test(ctx):

     if ctx.cmd == 'install':
         pypath = destdir + ctx.env.PYTHONARCHDIR  # + os.sep + 'ntp'
-        env = {'PYTHONPATH': pypath} if destdir != '/' else {}
+        env = {'PYTHONPATH': pypath}
         path = destdir + os.sep if destdir != '/' else '/'
         spath = path + ctx.env.SBINDIR[1:] + os.sep
         path = path + ctx.env.BINDIR[1:] + os.sep
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/devel/attachments/20201212/ccc57604/attachment-0001.htm>