[csw-devel] SF.net SVN: gar:[11537] csw/mgar/gar/v2

[wahwah at users.sourceforge.net]

Revision: 11537
          http://gar.svn.sourceforge.net/gar/?rev=11537&view=rev
Author:   wahwah
Date:     2010-11-09 15:46:21 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
mGAR v2: checkpkg, when suggesting a new package with a library, enclose gar suggestion lines in two additional lines.

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

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-11-09 15:45:51 UTC (rev 11536)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-11-09 15:46:21 UTC (rev 11537)
@@ -220,7 +220,7 @@
 # "checkpkg-".
 
 test_suite_ok=1
-checkpkg_module_dir=${command_basedir}/../lib/checkpkg.d
+checkpkg_module_dir="${command_basedir}/../lib/checkpkg.d"
 checkpkg_module_tag="checkpkg-"
 checkpkg_stats_basedir="${HOME}/.checkpkg/stats"
 
@@ -301,15 +301,14 @@
 if [[ "${ANALYZE}" -eq 1 ]]; then
 # Collecting errors and applying the overrides.
 # This has to use the original files.
-  echo "Applying the overrides and analyzing the results."
   ${command_basedir}/analyze_module_results.py \
       ${catalog_options} \
       ${quiet_options} \
       "$@"
   if [[ "$?" -ne 0 ]]; then
-    errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}"
+    errmsg "${RED}Checkpkg has reported errors.${COLOR_RESET}"
   else
-    print "${GREEN}All modular tests were successful.${COLOR_RESET}"
+    print "${GREEN}Checkpkg reports no errors.${COLOR_RESET}"
   fi
 else
 	echo "Skipping result analysis."

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-11-09 15:45:51 UTC (rev 11536)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-11-09 15:46:21 UTC (rev 11537)
@@ -1041,6 +1041,8 @@
         lib_path, lib_basename = os.path.split(binary_info["path"])
         tmp = su.MakePackageNameBySoname(soname)
         policy_pkgname_list, policy_catalogname_list = tmp
+        messenger.SuggestGarLine("# The following lines define a new package: "
+                                 "%s" % policy_pkgname_list[0])
         messenger.SuggestGarLine("PACKAGES += %s" % policy_pkgname_list[0])
         messenger.SuggestGarLine(
             "CATALOGNAME_%s = %s"
@@ -1059,6 +1061,8 @@
         messenger.SuggestGarLine(
             "RUNTIME_DEP_PKGS_%s += %s"
             % (pkgname, policy_pkgname_list[0]))
+        messenger.SuggestGarLine(
+            "# The end of %s definition" % policy_pkgname_list[0])
 
       check_names = False
     else:


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