Imported Upstream version 4.0.4

diff --git a/AUTHORS b/AUTHORS
index 542e223c9ede619b000871008052fd19b7f8c6d4..4969f00d57c47b5ae3ac16c35fb4f3049f60d797 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -73,6 +73,7 @@ Maru Newby <marun@redhat.com>
 Masaki Matsushita <glass.saga@gmail.com>
 Matt Riedemann <mriedem@us.ibm.com>
 Matthew Montgomery <matthew@signed8bit.com>
+Matthew Treinish <mtreinish@kortar.org>
 Matthew Treinish <treinish@linux.vnet.ibm.com>
 Mehdi Abaakouk <sileht@sileht.net>
 Michael Basnight <mbasnight@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 4e276cdd4473669fd30f571284a90a3975f49ab8..b3083e5168d83fef52f50a0f82d532588d2f8995 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+4.0.4
+-----
+
+* Revert "Remove win32/nt checks for wrapper script gen"
+
 4.0.3
 -----
 

diff --git a/PKG-INFO b/PKG-INFO
index 1f42d38d01172128d08129c8552d4b04f48d1506..612c664da978acb72914e29b829736671c75a8ad 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.0.3
+Version: 4.0.4
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
 Project-URL: Documentation, https://docs.openstack.org/pbr/
 Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
+Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
 Description: Introduction
         ============
         

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index 1f42d38d01172128d08129c8552d4b04f48d1506..612c664da978acb72914e29b829736671c75a8ad 100644 (file)
--- a/pbr.egg-info/PKG-INFO
+++ b/pbr.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 4.0.3
+Version: 4.0.4
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
 Project-URL: Documentation, https://docs.openstack.org/pbr/
 Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/
+Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/
 Description: Introduction
         ============
         

diff --git a/pbr/packaging.py b/pbr/packaging.py
index 1ff28da9b15cf2dc0c3191d9baef5f61c12d3e60..68df2886b65539bba563458ecf2d95dda1600c11 100644 (file)
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -409,6 +409,8 @@ class LocalDevelop(develop.develop):
     command_name = 'develop'
 
     def install_wrapper_scripts(self, dist):
+        if sys.platform == 'win32':
+            return develop.develop.install_wrapper_scripts(self, dist)
         if not self.exclude_scripts:
             for args in override_get_script_args(dist):
                 self.write_script(*args)
@@ -462,7 +464,13 @@ class LocalInstallScripts(install_scripts.install_scripts):
             # entry-points listed for this package.
             return
 
-        for args in override_get_script_args(dist, executable, is_wininst):
+        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)