comparison setup.py @ 18453:f5fbe15ca744 stable 2.5-rc

merge default into stable for 2.5 code freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 19 Jan 2013 17:24:33 -0600
parents 65a46635fb31
children 3f59cb1ccc73
comparison
equal deleted inserted replaced
18323:7648b87e76db 18453:f5fbe15ca744
149 # a missing __init__.py in mercurial/locale, we also ignore that. 149 # a missing __init__.py in mercurial/locale, we also ignore that.
150 err = [e for e in err.splitlines() 150 err = [e for e in err.splitlines()
151 if not e.startswith(b('Not trusting file')) \ 151 if not e.startswith(b('Not trusting file')) \
152 and not e.startswith(b('warning: Not importing'))] 152 and not e.startswith(b('warning: Not importing'))]
153 if err: 153 if err:
154 print >> sys.stderr, "stderr from '%s':" % (' '.join(cmd))
155 print >> sys.stderr, '\n'.join([' ' + e for e in err])
154 return '' 156 return ''
155 return out 157 return out
156 158
157 version = '' 159 version = ''
158 160