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

[wahwah at users.sourceforge.net]

Revision: 15445
          http://gar.svn.sourceforge.net/gar/?rev=15445&view=rev
Author:   wahwah
Date:     2011-08-26 11:51:05 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
checkpkg: Better package split suggestions

Reuse the $(DESCRIPTION) variable reference rather than expanding and using
the literal.

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

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2011-08-26 08:52:58 UTC (rev 15444)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2011-08-26 11:51:05 UTC (rev 15445)
@@ -271,8 +271,8 @@
       r'$(call baseisadirs,$(libdir),%s(\.\d+)*)'
       % (pkgname, escaped_soname))
   messenger.SuggestGarLine(
-      "SPKG_DESC_%s += %s, %s"
-      % (pkgname, description, soname))
+      "SPKG_DESC_%s += $(DESCRIPTION), %s"
+      % (pkgname, soname))
   messenger.SuggestGarLine(
       "RUNTIME_DEP_PKGS_%s += %s"
       % (base_pkgname, pkgname))

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-26 08:52:58 UTC (rev 15444)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-26 11:51:05 UTC (rev 15445)
@@ -1108,10 +1108,15 @@
           messenger.SuggestGarLine("# (If %s-dev doesn't exist yet)" % pkgname)
           messenger.SuggestGarLine("PACKAGES += %s-dev" % pkgname)
           messenger.SuggestGarLine(
+              "CATALOGNAME_%s-dev = %s_dev"
+              % (pkgname, pkg_data["basic_stats"]["catalogname"]))
+          messenger.SuggestGarLine(
+              "SPKG_DESC_%s += $(DESCRIPTION), development files" % pkgname)
+          messenger.SuggestGarLine(
               "PKGFILES_%s-dev += %s" % (pkgname, entry["path"]))
+          messenger.SuggestGarLine("# Maybe also the generic:")
           messenger.SuggestGarLine(
-              "CATALOGNAME_%s-dev = %s_dev"
-              % (pkgname, pkg_data["basic_stats"]["catalogname"]))
+              "# PKGFILES_%s-dev += $(PKGFILES_DEVEL)" % (pkgname))
           messenger.Message(
               "The package contains shared libraries together with the "
               "symlink of the form libfoo.so -> libfoo.so.1.  "

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