aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-01-20 09:49:20 +0800
committerKhem Raj <raj.khem@gmail.com>2021-01-19 20:29:45 -0800
commite31d5970cbc90ccc265f046577e019481a3141e6 (patch)
tree3a3d4d4ef0e5cd13649c4cdf5a86fa83f4ca8f53
parent712411fb117606503c962553f60906d2400fd591 (diff)
downloadmeta-openembedded-contrib-e31d5970cbc90ccc265f046577e019481a3141e6.tar.gz
blueman: refresh patch
Module 'time' had been imported in Functions.py by upstream, so not import in 0002-fix-fail-to-enable-bluetooth.patch and update accordingly. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch17
1 files changed, 4 insertions, 13 deletions
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch
index 00115cfca8..55d1ac94c5 100644
--- a/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch
+++ b/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch
@@ -20,7 +20,7 @@ https://github.com/blueman-project/blueman/pull/1121
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
- blueman/Functions.py | 12 +++++++++++-
+ blueman/Functions.py | 10 ++++++++++
blueman/plugins/applet/PowerManager.py | 4 ++++
2 files changed, 15 insertions(+), 1 deletion(-)
@@ -28,24 +28,15 @@ diff --git a/blueman/Functions.py b/blueman/Functions.py
index 3b76271..c5eeb27 100644
--- a/blueman/Functions.py
+++ b/blueman/Functions.py
-@@ -17,7 +17,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
--from time import sleep
-+from time import sleep, time
- import re
- import os
- import signal
@@ -86,6 +86,16 @@ def check_bluetooth_status(message, exitfunc):
return
applet.SetBluetoothStatus('(b)', True)
+
-+ timeout = time() + 10
++ timeout = time.time() + 10
+ while applet.GetRequestStatus():
-+ sleep(0.1)
-+ if time() > timeout:
++ time.sleep(0.1)
++ if time.time() > timeout:
+ # timeout 5s has been set in applet/PowerManager.py
+ # so it should NOT reach timeout here
+ logging.warning('Should NOT reach timeout.')