From d8005f86e644d152e2ec11722ec67693332932e5 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 31 Jan 2013 04:12:46 -0600 Subject: python3: bug 15833 That python bug cause problems when libreoffice is on a read-only media... which is very common for Mac as the dmg used to package the produce is seens as a read only volume. This patch the bug 15833 for MacOSX only since that is the platform that is most likely to be impacted, and because of bug 15431 that make patching on Windows more complex/dangerous. Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838 Reviewed-on: https://gerrit.libreoffice.org/1936 Reviewed-by: Tor Lillqvist Reviewed-by: Fridrich Strba Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- python3/UnpackedTarball_python3.mk | 6 ++++++ python3/python-3.3.0-15833.patch.1 | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 python3/python-3.3.0-15833.patch.1 diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 840108b85261..eb07def89a96 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -32,4 +32,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-ffi-clang.patch.1 \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + python3/python-3.3.0-15833.patch.1 \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/python3/python-3.3.0-15833.patch.1 b/python3/python-3.3.0-15833.patch.1 new file mode 100644 index 000000000000..71cef94535b1 --- /dev/null +++ b/python3/python-3.3.0-15833.patch.1 @@ -0,0 +1,25 @@ +iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py +--- a/Lib/importlib/_bootstrap.py ++++ b/Lib/importlib/_bootstrap.py +@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc + except FileExistsError: + # Probably another Python process already created the dir. + continue +- except PermissionError: +- # If can't get proper access, then just forget about writing +- # the data. ++ except OSError as exc: ++ # Could be a permission error, read-only filesystem: just forget ++ # about writing the data. ++ _verbose_message('could not create {!r}: {!r}', parent, exc) + return + try: + _write_atomic(path, data, _mode) + _verbose_message('created {!r}', path) +- except (PermissionError, FileExistsError): +- # Don't worry if you can't write bytecode or someone is writing +- # it at the same time. +- pass ++ except OSError as exc: ++ # Same as above: just don't write the bytecode. ++ _verbose_message('could not create {!r}: {!r}', path, exc) -- cgit