31 lines
1.2 KiB
Plaintext
31 lines
1.2 KiB
Plaintext
$OpenBSD: patch-ui4_devmgr5_py,v 1.6 2012/06/26 06:17:11 ajacoutot Exp $
|
|
--- ui4/devmgr5.py.orig Mon Jun 18 12:42:01 2012
|
|
+++ ui4/devmgr5.py Tue Jun 26 07:06:29 2012
|
|
@@ -1016,7 +1016,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
|
|
return
|
|
|
|
hplip_conf = ConfigParser.ConfigParser()
|
|
- fp = open("/etc/hp/hplip.conf", "r")
|
|
+ fp = open("${SYSCONFDIR}/hp/hplip.conf", "r")
|
|
hplip_conf.readfp(fp)
|
|
fp.close()
|
|
|
|
@@ -2101,7 +2101,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
|
|
if utils.which('hp-setup'):
|
|
cmd = 'hp-setup --gui'
|
|
else:
|
|
- cmd = 'python ./setup.py --gui'
|
|
+ cmd = '${MODPY_BIN} ./setup.py --gui'
|
|
|
|
log.debug(cmd)
|
|
utils.run(cmd, log_output=True, password_func=None, timeout=1)
|
|
@@ -2113,7 +2113,7 @@ class DevMgr5(QMainWindow, Ui_MainWindow):
|
|
if utils.which('hp-setup'):
|
|
cmd = 'hp-setup --gui --remove'
|
|
else:
|
|
- cmd = 'python ./setup.py --gui --remove'
|
|
+ cmd = '${MODPY_BIN} ./setup.py --gui --remove'
|
|
|
|
if self.cur_device_uri is not None:
|
|
cmd += ' --device=%s' % self.cur_device_uri
|