From 53d1cc71cbb1686621a37cca02342a5343260aff Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 28 Dec 2020 13:45:57 +0900 Subject: [PATCH] Imported Upstream version 4.0.4 --- AUTHORS | 1 + ChangeLog | 5 +++++ PKG-INFO | 4 ++-- pbr.egg-info/PKG-INFO | 4 ++-- pbr/packaging.py | 10 +++++++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 542e223..4969f00 100644 --- a/AUTHORS +++ b/AUTHORS @@ -73,6 +73,7 @@ Maru Newby Masaki Matsushita Matt Riedemann Matthew Montgomery +Matthew Treinish Matthew Treinish Mehdi Abaakouk Michael Basnight diff --git a/ChangeLog b/ChangeLog index 4e276cd..b3083e5 100644 --- 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 1f42d38..612c664 100644 --- 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 1f42d38..612c664 100644 --- 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 1ff28da..68df288 100644 --- 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) -- 2.34.1