782847 - Pymake native commands don't pass the correct environment to subprocesses

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Rain [:rain1] (inactive)]

http://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/file/7d221562bc4a/pymake/process.py#l209 sets os.environ to a new dictionary. However, os.environ is actually a magic dictionary which calls os.putenv and affects the environment of subprocesses, while this one doesn't.

Oh, Python...

Comment 1

[Rain [:rain1] (inactive)]

Attachment: use clear() and update() instead

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 651965 [details] [diff] [review]
use clear() and update() instead

Review of attachment 651965 [details] [diff] [review]:
-----------------------------------------------------------------

This looks good to me.

Please note in the commit message that this is backwards incompatible but it brings native command behavior inline with what it should have been.

::: tests/pycmd.py
@@ +9,5 @@
>      f.write(os.environ[args[1]])
>  
> +def writesubprocessenvtofile(args):
> +  with open(args[0], 'w') as f:
> +    p = subprocess.Popen([sys.executable, "-c", 

whitespace.

@@ +12,5 @@
> +  with open(args[0], 'w') as f:
> +    p = subprocess.Popen([sys.executable, "-c", 
> +                          "import os; print os.environ['%s']" % args[1]],
> +                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
> +    stdout, stderr = p.communicate()

Shouldn't there be a p.wait() here?

Comment 3

[Rain [:rain1] (inactive)]

(In reply to Gregory Szorc [:gps] from comment #2)
> @@ +12,5 @@
> > +  with open(args[0], 'w') as f:
> > +    p = subprocess.Popen([sys.executable, "-c", 
> > +                          "import os; print os.environ['%s']" % args[1]],
> > +                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
> > +    stdout, stderr = p.communicate()
> 
> Shouldn't there be a p.wait() here?

communicate implies wait: http://docs.python.org/library/subprocess.html#subprocess.Popen.communicate

Comment 4

[Rain [:rain1] (inactive)]

Pushed to the Pymake repository.
http://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/rev/8360595070d6

I'll push to mozilla-inbound once it reopens.

Comment 5

[Rain [:rain1] (inactive)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/dfe6a63f3ae9

Comment 6

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/dfe6a63f3ae9