2011-07-08 20:30:28 -04:00
|
|
|
$OpenBSD: patch-base_pkit_py,v 1.4 2011/07/09 00:30:28 ajacoutot Exp $
|
|
|
|
|
--- base/pkit.py.orig Sat May 14 20:26:06 2011
|
|
|
|
|
+++ base/pkit.py Sat Jul 9 02:05:35 2011
|
2010-03-21 07:07:43 -04:00
|
|
|
@@ -346,8 +346,8 @@ def copyPluginFiles(src_dir):
|
2009-07-13 04:14:28 -04:00
|
|
|
SANELIBDIR = '/usr/lib64/sane'
|
|
|
|
|
LIBDIR = '/usr/lib64'
|
|
|
|
|
else:
|
|
|
|
|
- SANELIBDIR = '/usr/lib/sane'
|
|
|
|
|
- LIBDIR = '/usr/lib'
|
|
|
|
|
+ SANELIBDIR = '${LOCALBASE}/lib/sane'
|
|
|
|
|
+ LIBDIR = '${LOCALBASE}/lib'
|
|
|
|
|
|
|
|
|
|
copies = []
|
|
|
|
|
|
2011-07-08 20:30:28 -04:00
|
|
|
@@ -482,7 +482,7 @@ def run_plugin_command(required=True, plugin_reason=PL
|
2009-07-13 04:14:28 -04:00
|
|
|
if utils.which("hp-plugin"):
|
|
|
|
|
cmd = su_sudo % ("hp-plugin -u %s --reason %s" % (req, plugin_reason))
|
|
|
|
|
else:
|
|
|
|
|
- cmd = su_sudo % ("python ./plugin.py -u %s --reason %s" % (req, plugin_reason))
|
|
|
|
|
+ cmd = su_sudo % ("${MODPY_BIN} ./plugin.py -u %s --reason %s" % (req, plugin_reason))
|
|
|
|
|
|
|
|
|
|
log.debug("%s" % cmd)
|
2010-05-30 02:29:07 -04:00
|
|
|
if password_f is not None:
|
