diff options
author | Christian Tismer <tismer@stackless.com> | 2015-08-16 02:35:32 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2015-08-16 02:35:32 +0200 |
commit | 5a31e29dccd7bd13c0d36c28218243afe3d76e98 (patch) | |
tree | 698dbb22589842b0ef5791867df3f530eaeee0b4 | |
parent | 4666f0869b2879bb37e1b5b5e867355bdbfe6f31 (diff) |
be more forgiving when file trees cannot be removed (happens often during window debugging)
-rw-r--r-- | setup.py | 15 | ||||
m--------- | sources/pyside2 | 27 | ||||
m--------- | sources/shiboken2 | 11 |
3 files changed, 37 insertions, 16 deletions
@@ -242,7 +242,11 @@ for n in ["pyside_package", "build", "PySide-%s" % __version__]: d = os.path.join(script_dir, n) if os.path.isdir(d): print("Removing %s" % d) - rmtree(d) + try: + rmtree(d) + except Exception as e: + print('***** problem removing "{}"'.format(d)) + print('ignored error: {}'.format(e)) # Prepare package folders for pkg in ["pyside_package/PySide", "pyside_package/pysideuic"]: @@ -556,9 +560,14 @@ class pyside_build(_build): return if os.path.exists(module_build_dir): log.info("Deleting module build folder %s..." % module_build_dir) - rmtree(module_build_dir) + try: + rmtree(module_build_dir) + except Exception as e: + print('***** problem removing "{}"'.format(module_build_dir)) + print('ignored error: {}'.format(e)) log.info("Creating module build folder %s..." % module_build_dir) - os.makedirs(module_build_dir) + if not os.path.exists(module_build_dir): + os.makedirs(module_build_dir) os.chdir(module_build_dir) module_src_dir = os.path.join(self.sources_dir, folder) diff --git a/sources/pyside2 b/sources/pyside2 -Subproject c5539eed974e5a6ce7a55f69e88e9b477fafa99 +Subproject b480da5601c9725094080a900b2c82d98648398 diff --git a/sources/shiboken2 b/sources/shiboken2 -Subproject 70b88893e95589dc5c42638e0dff1b408e1d1c3 +Subproject 28f1649a34d386966059b23d69ebd34433e593f |