[pypy-commit] pypy more-rposix: Fix merge.

amauryfa noreply at buildbot.pypy.org
Mon Apr 6 23:25:16 CEST 2015


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: more-rposix
Changeset: r76731:7e3beaacff39
Date: 2015-04-06 23:25 +0200
http://bitbucket.org/pypy/pypy/changeset/7e3beaacff39/

Log:	Fix merge.

diff --git a/rpython/rlib/rposix_stat.py b/rpython/rlib/rposix_stat.py
--- a/rpython/rlib/rposix_stat.py
+++ b/rpython/rlib/rposix_stat.py
@@ -411,6 +411,7 @@
         with lltype.scoped_alloc(STAT_STRUCT.TO) as stresult:
             arg = _as_bytes0(path)
             handle_posix_error('lstat', c_stat(arg, stresult))
+            return build_stat_result(stresult)
     else:
         traits = _preferred_traits(path)
         path = traits.as_str0(path)


More information about the pypy-commit mailing list