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

[wahwah at users.sourceforge.net]

Revision: 13204
          http://gar.svn.sourceforge.net/gar/?rev=13204&view=rev
Author:   wahwah
Date:     2011-02-05 19:39:15 +0000 (Sat, 05 Feb 2011)

Log Message:
-----------
checkpkg: Better messages for deprec. shared libs

It's better to only include simple data in the error parameter, and
provide a separate human-readable message through the Messenger class.

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

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2011-02-05 19:38:45 UTC (rev 13203)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2011-02-05 19:39:15 UTC (rev 13204)
@@ -95,8 +95,11 @@
             error_mgr.ReportError(
                 pkgname,
                 "deprecated-library",
-                ("%s %s %s/%s"
-                 % (binary_info["path"], msg, resolved_path, soname)))
+                ("file=%s lib=%s/%s"
+                 % (binary_info["path"], resolved_path, soname)))
+            messenger.Message(
+                "Binary %s links to a deprecated library %s/%s. %s"
+                % (binary_info["path"], resolved_path, soname, msg))
   if not resolved:
     orphan_sonames.append((soname, binary_info["path"]))
     if path_list:

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-02-05 19:38:45 UTC (rev 13203)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-02-05 19:39:15 UTC (rev 13204)
@@ -646,8 +646,8 @@
     self.error_mgr_mock.ReportError(
         'CSWrsync',
         'deprecated-library',
-        u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location '
-        u'/opt/csw/lib/libdb-4.7.so')
+        u'file=opt/csw/bin/sparcv8/rsync '
+        u'lib=/opt/csw/lib/libdb-4.7.so')
     self.pkg_data = [self.pkg_data]
     for i in range(1):
       self.error_mgr_mock.NeedFile(


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