Pass --reuse-build only to commands that use DistUtilsCommandMixin
authorDmitry Shachnev <mitya57@debian.org>
Wed, 16 Dec 2020 17:26:18 +0000 (20:26 +0300)
committerDmitry Shachnev <mitya57@debian.org>
Tue, 16 Nov 2021 09:16:14 +0000 (09:16 +0000)
This is a concatenation of two upstream commits:
- https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=ed0571df854a232e
- https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=3f00c2adad2e38b0

Gbp-Pq: Name fix-reuse-build.patch

build_scripts/setup_runner.py

index 57c8fbd1f99a8e0ed2bb7fd37668d0e5b1be99ac..3c7116b825340a86d0550f16bc25e55a00fe3591 100644 (file)
@@ -88,8 +88,13 @@ class SetupRunner(object):
         internal_build_type_arg = self.construct_internal_build_type_cmd_line_argument(build_type)
         setup_cmd = [sys.executable] + self.sub_argv + [internal_build_type_arg]
 
+        command = self.sub_argv[0]
+        if command == 'setup.py' and len(self.sub_argv) > 1:
+            command = self.sub_argv[1]
+
         # Add --reuse-build option if requested and not already present.
-        if reuse_build and not self.cmd_line_argument_is_in_args("reuse-build", self.sub_argv):
+        if (reuse_build and command in ('bdist_wheel', 'build', 'build_rst_docs', 'install')
+            and not self.cmd_line_argument_is_in_args("reuse-build", self.sub_argv)):
             setup_cmd.append(self.construct_cmd_line_argument("reuse-build"))
         self.invocations_list.append(setup_cmd)