subrepo: svn abort now depends on exit code (issue2833)

This commit is contained in:
Regis Desgroppes 2011-05-31 16:22:04 -05:00
parent b7ce21cbd6
commit 2a89a4fdff

View File

@ -540,11 +540,13 @@ class svnsubrepo(abstractsubrepo):
env['LC_MESSAGES'] = 'C'
p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True, env=env)
universal_newlines=True, env=env)
stdout, stderr = p.communicate()
stderr = stderr.strip()
if p.returncode:
raise util.Abort(stderr or 'exited with code %d' % p.returncode)
if stderr:
raise util.Abort(stderr)
self._ui.warn(stderr + '\n')
return stdout
@propertycache