From 5ecd3c7101c3b925a12e6a0c7ee76d7c186346b9 Mon Sep 17 00:00:00 2001 From: Brian Hou Date: Fri, 8 Aug 2014 06:51:12 +0000 Subject: [PATCH] Revert "Fix argparse issue for RHEL 6.5." This reverts commit d088fde2ea59423d153f32d65be684be62727232. Since the underlying problem with argparse has been resolved in python 2.7 and filtering out argparse for python 2.6 has been removed, there is no longer a need to explicitly install argparse for python 2.6. Closes-bug: #1346364 Change-Id: If9534bf5a4400f5f72475c67a8e6e14da08f9562 --- .../install.d/os-apply-config-source-install/10-os-apply-config | 1 - .../os-refresh-config-source-install/10-os-refresh-config | 1 - 2 files changed, 2 deletions(-) diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config index ed464acdd..583ab1df5 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config @@ -18,7 +18,6 @@ else /opt/stack/venvs/os-apply-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. /opt/stack/venvs/os-apply-config/bin/pip install -U 'pbr>=0.6,<1.0' - /opt/stack/venvs/os-apply-config/bin/pip install -U 'argparse' /opt/stack/venvs/os-apply-config/bin/pip install --pre -U os-apply-config fi diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config index c4a763578..f53dd6fcf 100755 --- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config +++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config @@ -22,7 +22,6 @@ else /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0' - /opt/stack/venvs/os-refresh-config/bin/pip install -U 'argparse' /opt/stack/venvs/os-refresh-config/bin/pip install --pre -U os-refresh-config fi