summaryrefslogtreecommitdiff
path: root/src/leap/platform_init/initializers.py
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-05-07 17:13:50 -0300
committerTomas Touceda <chiiph@leap.se>2013-05-07 17:13:50 -0300
commitbed65dc627d1a064dcbd23e2ade581e91c7f1b28 (patch)
tree476a48110d06417ac34b474fa1346a8af2778593 /src/leap/platform_init/initializers.py
parent4cc3c7d3f0d63d97df0d40c3e2d0941c5e069eb9 (diff)
parent3f304a2241196edda14deb9fcbe595b434a08ff2 (diff)
Merge remote-tracking branch 'kali/feature/sanitize-config' into develop
Diffstat (limited to 'src/leap/platform_init/initializers.py')
-rw-r--r--src/leap/platform_init/initializers.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/leap/platform_init/initializers.py b/src/leap/platform_init/initializers.py
index cf7e71b8..91c7086b 100644
--- a/src/leap/platform_init/initializers.py
+++ b/src/leap/platform_init/initializers.py
@@ -103,7 +103,6 @@ def WindowsInitializer():
inf_path = os.path.join(driver_path,
"OemWin2k.inf")
cmd = [dev_installer, "install", inf_path, "tap0901"]
- # XXX should avoid shell expansion.
ret = subprocess.call(cmd, stdout=subprocess.PIPE, shell=True)
else:
logger.error("Tried to install TAP driver, but the installer "
@@ -120,8 +119,9 @@ def _darwin_has_tun_kext():
has_kext = os.path.isdir("/System/Library/Extensions/tun.kext")
has_startup = os.path.isdir("/System/Library/StartupItems/tun")
has_tun_and_startup = has_kext and has_startup
- logger.debug('platform initializer check: has tun_and_startup = %s' %
- (has_tun_and_startup,))
+ logger.debug(
+ 'platform initializer check: has tun_and_startup = %s' %
+ (has_tun_and_startup,))
return has_tun_and_startup
@@ -155,14 +155,14 @@ def DarwinInitializer():
ret = msg.exec_()
if ret == QtGui.QMessageBox.Yes:
- installer_path = os.path.join(os.getcwd(),
- "..",
- "Resources",
- "tuntap-installer.app")
+ installer_path = os.path.join(
+ os.getcwd(),
+ "..",
+ "Resources",
+ "tuntap-installer.app")
if os.path.isdir(installer_path):
cmd = ["open %s" % (installer_path,)]
try:
- # XXX should avoid shell expansion
ret = subprocess.call(
cmd, stdout=subprocess.PIPE,
shell=True)