From 89ecf8cabebfd13e50473fba7fb98f65a52b02d8 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 20 Jan 2013 21:56:57 +1000 Subject: Make path to ldconfig configurable The FHS (2.3) says having ldconfig in /sbin is optional and it is usually located in /usr/sbin. So /sbin/ldconfig should not be hard coded in pacman. Instead, provide a configure option --with-ldconfig that defaults to the current path. Signed-off-by: Allan McRae --- test/pacman/pactest.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/pacman/pactest.py') diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index ea44be5c..2b1dee63 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -85,6 +85,9 @@ def create_parser(): parser.add_option("--scriptlet-shell", type = "string", dest = "scriptletshell", default = "/bin/sh", help = "specify path to shell used for install scriptlets") + parser.add_option("--ldconfig", type = "string", + dest = "ldconfig", default = "/sbin/ldconfig", + help = "specify path to ldconfig") return parser @@ -104,6 +107,7 @@ if __name__ == "__main__": env.pacman["valgrind"] = opts.valgrind env.pacman["manual-confirm"] = opts.manualconfirm env.pacman["scriptlet-shell"] = opts.scriptletshell + env.pacman["ldconfig"] = opts.ldconfig if opts.testcases is None or len(opts.testcases) == 0: print "no tests defined, nothing to do" -- cgit v1.2.3