From 7fa138957b8da86248a1dd767e1e5a4c278c516c Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 5 Aug 2009 07:45:06 +0000
Subject: Check existence of wpa_passphrase before invoking #1137
---
src/jarabe/desktop/keydialog.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index 93f07c4..9bcfc70 100644
a
|
b
|
|
16 | 16 | |
17 | 17 | import hashlib |
18 | 18 | from gettext import gettext as _ |
19 | | |
| 19 | import os |
20 | 20 | import gtk |
21 | 21 | import dbus |
22 | 22 | |
… |
… |
class WPAKeyDialog(KeyDialog): |
238 | 238 | real_key = key |
239 | 239 | elif len(key) >= 8 and len(key) <= 63: |
240 | 240 | # passphrase |
| 241 | if os.path.exists('/usr/sbin/wpa_passphrase'): |
| 242 | wpa_passphrase = '/usr/sbin/wpa_passphrase' |
| 243 | elif os.path.exists('/usr/bin/wpa_passphrase'): |
| 244 | wpa_passphrase = '/usr/bin/wpa_passphrase' |
| 245 | else: |
| 246 | raise RuntimeError("Can't find wpa_passphrase command") |
241 | 247 | from subprocess import Popen, PIPE |
242 | | p = Popen(['/usr/sbin/wpa_passphrase', ssid, key], stdout=PIPE) |
| 248 | p = Popen([wpa_passphrase, ssid, key], stdout=PIPE) |
243 | 249 | for line in p.stdout: |
244 | 250 | if line.strip().startswith("psk="): |
245 | 251 | real_key = line.strip()[4:] |