Merge "Fixes Windows generated scripts headers"

1 files changed, 7 insertions, 5 deletions

diff --git a/pbr/packaging.py b/pbr/packaging.py
index 90d603b..486f029 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -357,11 +357,6 @@ class LocalInstallScripts(install_scripts.install_scripts):
     command_name = 'install_scripts'
 
     def run(self):
-        if os.name != 'nt':
-            get_script_args = override_get_script_args
-        else:
-            get_script_args = easy_install.get_script_args
-
         import distutils.command.install_scripts
 
         self.run_command("egg_info")
@@ -386,6 +381,13 @@ class LocalInstallScripts(install_scripts.install_scripts):
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
+
+        if os.name != 'nt':
+            get_script_args = override_get_script_args
+        else:
+            get_script_args = easy_install.get_script_args
+            executable = '"%s"' % executable
+
         for args in get_script_args(dist, executable, is_wininst):
             self.write_script(*args)