From 161b8e48d893db3d6b911cab03fd936b60f121e8 Mon Sep 17 00:00:00 2001 From: "Carl D. Roth" Date: Fri, 6 May 2016 11:07:10 -0700 Subject: [PATCH] Revert dumb python path hack --- packages/base/all/vendor-config-onl/src/bin/loader-shell | 4 ---- packages/base/all/vendor-config-onl/src/bin/onie-shell | 4 ---- packages/base/all/vendor-config-onl/src/bin/onl-install | 4 ---- packages/base/all/vendor-config-onl/src/bin/onl-recover | 4 ---- packages/base/all/vendor-config-onl/src/bin/pyfit | 4 ---- 5 files changed, 20 deletions(-) diff --git a/packages/base/all/vendor-config-onl/src/bin/loader-shell b/packages/base/all/vendor-config-onl/src/bin/loader-shell index 0ee08028..e006aef4 100755 --- a/packages/base/all/vendor-config-onl/src/bin/loader-shell +++ b/packages/base/all/vendor-config-onl/src/bin/loader-shell @@ -3,9 +3,5 @@ """Run native ONIE tools """ -import sys -import distutils.sysconfig -sys.path.append("/usr/lib/python%s/dist-packages" - % distutils.sysconfig.get_python_version()) import onl.install.ShellApp onl.install.ShellApp.Loader.main() diff --git a/packages/base/all/vendor-config-onl/src/bin/onie-shell b/packages/base/all/vendor-config-onl/src/bin/onie-shell index ecf8b7a3..8ff8343e 100755 --- a/packages/base/all/vendor-config-onl/src/bin/onie-shell +++ b/packages/base/all/vendor-config-onl/src/bin/onie-shell @@ -3,9 +3,5 @@ """Run native ONIE tools """ -import sys -import distutils.sysconfig -sys.path.append("/usr/lib/python%s/dist-packages" - % distutils.sysconfig.get_python_version()) import onl.install.ShellApp onl.install.ShellApp.Onie.main() diff --git a/packages/base/all/vendor-config-onl/src/bin/onl-install b/packages/base/all/vendor-config-onl/src/bin/onl-install index 6d961e6e..4505eee5 100755 --- a/packages/base/all/vendor-config-onl/src/bin/onl-install +++ b/packages/base/all/vendor-config-onl/src/bin/onl-install @@ -3,9 +3,5 @@ """Install switch light """ -import sys -import distutils.sysconfig -sys.path.append("/usr/lib/python%s/dist-packages" - % distutils.sysconfig.get_python_version()) import onl.install.App onl.install.App.main() diff --git a/packages/base/all/vendor-config-onl/src/bin/onl-recover b/packages/base/all/vendor-config-onl/src/bin/onl-recover index f7b6f0c0..6a9a8589 100755 --- a/packages/base/all/vendor-config-onl/src/bin/onl-recover +++ b/packages/base/all/vendor-config-onl/src/bin/onl-recover @@ -3,9 +3,5 @@ """Recover switch light """ -import sys -import distutils.sysconfig -sys.path.append("/usr/lib/python%s/dist-packages" - % distutils.sysconfig.get_python_version()) import onl.install.RecoverApp onl.install.RecoverApp.main() diff --git a/packages/base/all/vendor-config-onl/src/bin/pyfit b/packages/base/all/vendor-config-onl/src/bin/pyfit index ea644d72..4ee57728 100755 --- a/packages/base/all/vendor-config-onl/src/bin/pyfit +++ b/packages/base/all/vendor-config-onl/src/bin/pyfit @@ -3,9 +3,5 @@ """Swiss-army-knife FIT decoder """ -import sys -import distutils.sysconfig -sys.path.append("/usr/lib/python%s/dist-packages" - % distutils.sysconfig.get_python_version()) import onl.install.Fit onl.install.Fit.App.main()