[PATCH 2 of 5] setup: update runcmd() to also return the exit status

Adam Simpkins simpkins at fb.com
Wed Jun 28 14:11:25 EDT 2017


On Jun 28, Yuya Nishihara wrote:
> On Mon, 26 Jun 2017 11:37:41 -0700, Adam Simpkins wrote:
> > # HG changeset patch
> > # User Adam Simpkins <simpkins at fb.com>
> > # Date 1498501890 25200
> > #      Mon Jun 26 11:31:30 2017 -0700
> > # Node ID a687d5c7ac85481471d973aa06c6fd4b1dad91f0
> > # Parent  532781f3e93229a495ca33d7569787d4bab88756
> > setup: update runcmd() to also return the exit status
> > 
> > Update the runcmd() helper function so it also returns the process exit status.
> > This allows callers to more definitively determine if a command failed, rather
> > than testing only for the presence of data on stderr.
> > 
> > I don't expect this to have any behavioral changes for now: the commands
> > invoked by setup generally should print data on stderr if and only if they
> > failed.
> > 
> > diff --git a/setup.py b/setup.py
> > --- a/setup.py
> > +++ b/setup.py
> > @@ -146,10 +146,10 @@
> >      p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
> >                           stderr=subprocess.PIPE, env=env)
> >      out, err = p.communicate()
> > -    return out, err
> > +    return p.returncode, out, err
> 
> if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
>     version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()
> 
> Perhaps, this should be updated as well.

Whoops, I missed that this index needs to be updated.  Thanks for
catching it.  I'll send out a patch.

-- 
Adam Simpkins
simpkins at fb.com


More information about the Mercurial-devel mailing list