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

[wahwah at users.sourceforge.net]

Revision: 14133
          http://gar.svn.sourceforge.net/gar/?rev=14133&view=rev
Author:   wahwah
Date:     2011-04-12 08:32:50 +0000 (Tue, 12 Apr 2011)

Log Message:
-----------
checkpkg: Better message for bad content error

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

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2011-04-12 08:23:07 UTC (rev 14132)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2011-04-12 08:32:50 UTC (rev 14133)
@@ -715,13 +715,12 @@
 def CheckBadContent(pkg_data, error_mgr, logger, messenger):
   for regex in pkg_data["bad_paths"]:
     for file_name in pkg_data["bad_paths"][regex]:
-      messenger.Message("File %s contains bad content: %s. "
-                        "It's usually build-machine data. "
-                        "If it's a legacy file you can't modify, "
-                        "add an override "
-                        "for this file.  After doing so, run checkpkg "
-                        "again, you'll need to add an override for "
-                        "the override file too." % (file_name, regex))
+      messenger.Message(
+          "File %s contains bad content: %s. "
+          "If it's a legacy file you can't modify, "
+          "or if you investigated the issue and the string does not pose "
+          "a real issue, you can override this error. "
+          % (file_name, repr(regex)))
       error_mgr.ReportError("file-with-bad-content", "%s %s" % (regex, file_name))
 
 


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