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

[wahwah at users.sourceforge.net]

Revision: 11214
          http://gar.svn.sourceforge.net/gar/?rev=11214&view=rev
Author:   wahwah
Date:     2010-10-10 20:33:30 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
mGAR v2: checkpkg, a better message about shared library package names.

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

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-10-10 20:33:02 UTC (rev 11213)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-10-10 20:33:30 UTC (rev 11214)
@@ -1000,17 +1000,23 @@
         policy_pkgname_list, policy_catalogname_list = tmp
         if pkgname not in policy_pkgname_list:
           error_mgr.ReportError(
-              "shared-lib-wrong-pkgname",
+              "shared-lib-pkgname-mismatch",
               "file=%s pkgname=%s expected=%s"
               % (binary_info["path"], pkgname, policy_pkgname_list))
           messenger.OneTimeMessage(
               soname,
-              "Shared libraries that other software might link "
-              "to, need to be separated out into own packages. "
-              "In this case, the suggested package names are %s."
-              % policy_pkgname_list)
+              "This shared library (%s) is in a directory indicating that it "
+              "is likely to be linked to by other programs.  If this is the "
+              "case, the library is best packaged separately, in a package "
+              "with a library-specific name.  Examples of such names include: "
+              "%s. If this library is not meant to be linked to by other "
+              "packages, it's best moved to a 'private' directory.  "
+              "For example, instead of /opt/csw/lib/foo.so, "
+              "try /opt/csw/lib/projectname/foo.so."
+              % (binary_info["path"], policy_pkgname_list))
 
 
+
 def CheckSharedLibraryPkgDoesNotHaveTheSoFile(pkg_data, error_mgr, logger, messenger):
   """If it's a package with shared libraries, it should not contain the .so file.
 

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-10-10 20:33:02 UTC (rev 11213)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-10-10 20:33:30 UTC (rev 11214)
@@ -1319,19 +1319,19 @@
   def CheckpkgTest(self):
     self.pkg_data = neon_stats[0]
     self.error_mgr_mock.ReportError(
-        'shared-lib-wrong-pkgname',
+        'shared-lib-pkgname-mismatch',
         "file=opt/csw/lib/libneon.so.26.0.4 pkgname=CSWneon "
         "expected=['CSWlibneon26', 'CSWlibneon-26']")
     self.error_mgr_mock.ReportError(
-        'shared-lib-wrong-pkgname',
+        'shared-lib-pkgname-mismatch',
         "file=opt/csw/lib/libneon.so.27.2.0 pkgname=CSWneon "
         "expected=['CSWlibneon27', 'CSWlibneon-27']")
     self.error_mgr_mock.ReportError(
-        'shared-lib-wrong-pkgname',
+        'shared-lib-pkgname-mismatch',
         "file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkgname=CSWneon "
         "expected=['CSWlibneon26', 'CSWlibneon-26']")
     self.error_mgr_mock.ReportError(
-        'shared-lib-wrong-pkgname',
+        'shared-lib-pkgname-mismatch',
         "file=opt/csw/lib/sparcv9/libneon.so.27.2.0 pkgname=CSWneon "
         "expected=['CSWlibneon27', 'CSWlibneon-27']")
 


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