Show More
@@ -104,9 +104,11 b' def runcmd(cmd, env):' | |||||
104 | # If root is executing setup.py, but the repository is owned by |
|
104 | # If root is executing setup.py, but the repository is owned by | |
105 | # another user (as in "sudo python setup.py install") we will get |
|
105 | # another user (as in "sudo python setup.py install") we will get | |
106 | # trust warnings since the .hg/hgrc file is untrusted. That is |
|
106 | # trust warnings since the .hg/hgrc file is untrusted. That is | |
107 | # fine, we don't want to load it anyway. |
|
107 | # fine, we don't want to load it anyway. Python may warn about | |
|
108 | # a missing __init__.py in mercurial/locale, we also ignore that. | |||
108 | err = [e for e in err.splitlines() |
|
109 | err = [e for e in err.splitlines() | |
109 |
if not e.startswith('Not trusting file') |
|
110 | if not e.startswith('Not trusting file') \ | |
|
111 | and not e.startswith('warning: Not importing')] | |||
110 | if err: |
|
112 | if err: | |
111 | return '' |
|
113 | return '' | |
112 | return out |
|
114 | return out |
General Comments 0
You need to be logged in to leave comments.
Login now