[csw-devel] SF.net SVN: gar:[10480] csw/mgar/gar/v2/lib/python/dependency_checks.py

[wahwah at users.sourceforge.net]

Revision: 10480
          http://gar.svn.sourceforge.net/gar/?rev=10480&view=rev
Author:   wahwah
Date:     2010-07-09 10:11:47 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, better on-screen messages about soname resolution.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 09:50:35 UTC (rev 10479)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 10:11:47 UTC (rev 10480)
@@ -70,10 +70,15 @@
           break
       if not resolved:
         orphan_sonames.append((soname, binary_info["path"]))
+        if path_list:
+          path_msg = "was available at the following paths: %s." % path_list
+        else:
+          path_msg = ("was not present on the filesystem, "
+                      "nor in the packages under examination.")
         messenger.Message(
             "%s could not be resolved for %s, with rpath %s, expanded to %s, "
-            "while the file was available at the following paths: %s"
-            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_list))
+            "while the file %s"
+            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_msg))
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
     error_mgr.ReportError(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.