[jhbuild] Implement sysdeps --install for path systemmodules (GNOME bug 681344)



commit 437d6d3f8a98848d7049ea96bce0c150069639d7
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Oct 11 08:57:49 2012 +1030

    Implement sysdeps --install for path systemmodules (GNOME bug 681344)
    
    Implement YumSystemInstall

 jhbuild/utils/systeminstall.py |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py
index 0242299..11221e1 100755
--- a/jhbuild/utils/systeminstall.py
+++ b/jhbuild/utils/systeminstall.py
@@ -261,17 +261,18 @@ class YumSystemInstall(SystemInstall):
     def __init__(self):
         SystemInstall.__init__(self)
 
-    def install(self, pkgconfig_ids):
+    def install(self, uninstalled_pkgconfigs, uninstalled_filenames):
         logging.info(_('Using yum to install packages.  Please wait.'))
 
-        native_packages = []
-        for pkgconfig in pkgconfig_ids:
-            native_packages.append('pkgconfig(' + pkgconfig + ')')
-
-        if native_packages:
-            logging.info(_('Installing: %(pkgs)s') % {'pkgs': ' '.join(native_packages)})
+        if len(uninstalled_pkgconfigs) + len(uninstalled_filenames) > 0:
+            logging.info(_('Installing:\n  %(pkgs)s') %
+                         {'pkgs': '\n  '.join([modname for modname, pkg in
+                                               uninstalled_pkgconfigs +
+                                               uninstalled_filenames])})
             args = self._root_command_prefix_args + ['yum', '-y', 'install']
-            args.extend(native_packages)
+            args.extend(['pkgconfig(%s)' % pkg for modname, pkg in
+                         uninstalled_pkgconfigs])
+            args.extend([pkg for modname, pkg in uninstalled_filenames])
             subprocess.check_call(args)
         else:
             logging.info(_('Nothing to install'))



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]