From 81d0c5948b7121f7289b33180953ed4e4e71187a Mon Sep 17 00:00:00 2001 From: j1nx Date: Wed, 23 Sep 2020 20:32:20 +0200 Subject: [PATCH] MycroftOS: Remove pip logic patch for now as it causes skill loading issues at first run. --- ...-logic-and-change-to-user-by-default.patch | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 buildroot-external/package/python-msm/0002-Remove-sudo-pip-logic-and-change-to-user-by-default.patch diff --git a/buildroot-external/package/python-msm/0002-Remove-sudo-pip-logic-and-change-to-user-by-default.patch b/buildroot-external/package/python-msm/0002-Remove-sudo-pip-logic-and-change-to-user-by-default.patch deleted file mode 100644 index ac709afb..00000000 --- a/buildroot-external/package/python-msm/0002-Remove-sudo-pip-logic-and-change-to-user-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 89782d56ed0fa1b63fef350520abea59c79bf283 Mon Sep 17 00:00:00 2001 -From: j1nx -Date: Mon, 14 Sep 2020 16:38:58 +0200 -Subject: [PATCH 1/1] Remove "sudo" pip logic and change to --user by default - ---- - msm/skill_entry.py | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/msm/skill_entry.py b/msm/skill_entry.py -index 3170656..ec78609 100644 ---- a/msm/skill_entry.py -+++ b/msm/skill_entry.py -@@ -295,14 +295,10 @@ class SkillEntry(object): - constraints = DEFAULT_CONSTRAINTS - - LOG.info('Installing requirements.txt for ' + self.name) -- can_pip = os.access(dirname(sys.executable), os.W_OK | os.X_OK) -- pip_args = [sys.executable, '-m', 'pip', 'install'] -+ pip_args = [sys.executable, '-m', 'pip', 'install', '--user'] - if constraints: - pip_args += ['-c', constraints] - -- if not can_pip: -- pip_args = ['sudo', '-n'] + pip_args -- - with self.pip_lock: - """ - Iterate over the individual Python packages and --- -2.20.1 -