Python variables defined in scripts sourced by include_defs() are not known any more

[davido]

Gerrit Code Review supports two different modes for building plugins: in Gerrit tree and standalone modes. For this to work, we defined __standalone_mode__ variable and setting it differently in different modes. I am sure it worked already, but stopped working in recent Buck version:

Given the following BUCK file:

include_defs('//foo')
baz = 'qux' if __bar__ else 'quux'

def custom(
    name,
    dest):
  genrule(
    name = name,
    cmd = 'cd $TMP;' +
      ('mkdir -p `dirname %s`;' % '$OUT') +
       'echo %s >$OUT' % baz,
    out = dest,
  )

custom(
  name = 'foo',
  dest = 'bar/baz/qux.txt',
)

and this definition of foo:

__bar__ = True

__bar__ is not visible any more in root BUCK file, where the include file was sourced from:

$ buck build :foo
Using buckd.
Traceback (most recent call last):
[...]
  File "/home/davido/projects/buck_include_problem/BUCK", line 3, in <module>
    baz = 'qux' if __bar__ else 'quux'
NameError: name '__bar__' is not defined

Expected: it should just work and produce:

$ buck build :foo
Using buckd.
[-] PROCESSING BUCK FILES...FINISHED 0,0s
[-] BUILDING...FINISHED 0,0s (1/1 JOBS)

$ cat buck-out/gen/bar/baz/qux.txt
qux

[sdwilsh]

@andrewjcg, I suspect this is related to your import changes, yeah?

[andrewjcg]

Ah yeah, this was caused by 6064096, which made "include_defs()" behave more like "from ___ import *", which doesn't import variables with leading underscores. In this case, is it ok to change the name of the variable to not use leading underscores. Sorry for the churn here.

[davido]

Thanks. Will rename it then.