Run /sbin/ldconfig after every installation of shared objects.

diff --git a/python/pakfire/actions.py b/python/pakfire/actions.py
index 0d714f51b9f5f35a4afc625ec41252de8ac1a384..3ee64c9be8aa76d8e75c9ee9d096c2feaf06d2ff 100644 (file)
--- a/python/pakfire/actions.py
+++ b/python/pakfire/actions.py
@@ -77,6 +77,38 @@ class Action(object):
                """
                return self.pakfire.repos.local
 
+       def do(self, cmd, **kwargs):
+               # If we are running in /, we do not need to chroot there.
+               chroot_path = None
+               if not self.pakfire.path == "/":
+                       chroot_path = self.pakfire.path
+
+               # Find suitable cwd.
+               cwd = "/"
+               for i in ("tmp", "root"):
+                       _cwd = os.path.join(chroot_path, i)
+                       if os.path.exists(_cwd):
+                               cwd = _cwd
+                               break
+
+               args = {
+                       "cwd"         : cwd,
+                       "logger"      : logging.getLogger(),
+                       "personality" : self.pakfire.distro.personality,
+                       "shell"       : False,
+                       "timeout"     : SCRIPTLET_TIMEOUT,
+               }
+
+               # Overwrite by args that were passed.
+               args.update(kwargs)
+
+               # You can never overwrite chrootPath.
+               args.update({
+                       "chrootPath"  : chroot_path,
+               })
+
+               return chroot.do(cmd, **args)
+
 
 class ActionScript(Action):
        type = "script"
@@ -148,18 +180,8 @@ class ActionScript(Action):
                # Generate the script command.
                command = [script_file_chroot] + self.args
 
-               # If we are running in /, we do not need to chroot there.
-               chroot_path = None
-               if not self.pakfire.path == "/":
-                       chroot_path = self.pakfire.path
-
                try:
-                       ret = chroot.do(command, cwd="/tmp",
-                               chrootPath=chroot_path,
-                               personality=self.pakfire.distro.personality,
-                               shell=False,
-                               timeout=SCRIPTLET_TIMEOUT,
-                               logger=logging.getLogger())
+                       self.do(command)
 
                except Error, e:
                        raise ActionError, _("The scriptlet returned an error:\n%s" % e)
@@ -231,6 +253,28 @@ class ActionInstall(Action):
 
                self.pkg.extract(_("Installing"), prefix=self.pakfire.path)
 
+               # Check if shared objects were extracted. If this is the case, we need
+               # to run ldconfig.
+               ldconfig_needed = False
+               for file in self.pkg.filelist:
+                       if ".so." in file.name:
+                               ldconfig_needed = True
+                               break
+
+                       if "etc/ld.so.conf" in file.name:
+                               ldconfig_needed = True
+                               break
+
+               if ldconfig_needed:
+                       # Check if ldconfig is present.
+                       ldconfig = os.path.join(self.pakfire.path, LDCONFIG[1:])
+
+                       if os.path.exists(ldconfig) and os.access(ldconfig, os.X_OK):
+                               self.do(LDCONFIG)
+
+                       else:
+                               logging.debug("ldconfig is not present or not executable.")
+
 
 class ActionUpdate(Action):
        type = "upgrade"

diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py
index 69d1960c8bc27725972b27e416096954c56ccf8a..9b4c40e362c9055bb68069efbe6c80aa274c1636 100644 (file)
--- a/python/pakfire/constants.py
+++ b/python/pakfire/constants.py
@@ -185,3 +185,5 @@ SCRIPTS = (
        "posttransun",
        "posttransup",
 )
+
+LDCONFIG = "/sbin/ldconfig"