|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
From 33c188c38f5f89e704e4c775205e1d90ca55bc0d Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
From: Alec Leamas <leamas.alec@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
Date: Sun, 21 Aug 2016 17:33:19 +0200
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
Subject: [PATCH] lirc-setup: Fix crasher bugfix.
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
Fixes https://retrace.fedoraproject.org/faf/reports/1166394/
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
---
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
tools/lirc-setup/mvc_model.py | 4 ++--
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
diff --git a/tools/lirc-setup/mvc_model.py b/tools/lirc-setup/mvc_model.py
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
index 02d1413..48864d8 100644
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
--- a/tools/lirc-setup/mvc_model.py
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
+++ b/tools/lirc-setup/mvc_model.py
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
@@ -362,10 +362,10 @@ class DrvctlDeviceListModel(DeviceListModel):
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
self.label_by_device = {}
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
trypath = os.path.abspath(_here("../mode2"))
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
if not os.path.exists(trypath):
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
- trypath = os.path.join(BINDIR, "mode2")
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
+ trypath = os.path.join(config.BINDIR, "mode2")
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
if not os.path.exists(trypath):
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
raise FileNotFoundError("trypath")
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
- cmd = [trypath, "--driver" , self.driver_id, "--list-devices"]
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
+ cmd = [trypath, "--driver", self.driver_id, "--list-devices"]
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
try:
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
result = subprocess.check_output(cmd, universal_newlines=True)
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
except (OSError, subprocess.CalledProcessError):
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
--
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
2.5.5
|
|
![](https://seccdn.libravatar.org/avatar/6a459c619212a10ff5246170adb66fd54ea35372bbf62c8b5656728a1db82440?s=16&d=retro) |
8d58ace |
|