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

[wahwah at users.sourceforge.net]

Revision: 18664
          http://gar.svn.sourceforge.net/gar/?rev=18664&view=rev
Author:   wahwah
Date:     2012-07-08 15:57:42 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
checkpkg: Handle pkgchk error codes

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2012-07-07 16:25:04 UTC (rev 18663)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2012-07-08 15:57:42 UTC (rev 18664)
@@ -249,7 +249,7 @@
             srv4_file=db_stat_objs_by_pkgname[e.pkgname],
             pkgname=e.pkgname,
             tag_name=e.tag_name,
-            tag_info=e.tag_info,
+            tag_info=unicode(e.tag_info, "utf-8"),
             msg=e.msg,
             os_rel=sqo_os_rel,
             catrel=sqo_catrel,

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2012-07-07 16:25:04 UTC (rev 18663)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2012-07-08 15:57:42 UTC (rev 18664)
@@ -780,7 +780,8 @@
 
 def CheckPkgchk(pkg_data, error_mgr, logger, messenger):
   if pkg_data["pkgchk"]["return_code"] != 0:
-    error_mgr.ReportError("pkgchk-failed-with-code", pkg_data["pkgchk"]["return_code"])
+    error_mgr.ReportError("pkgchk-failed-with-code",
+                          unicode(pkg_data["pkgchk"]["return_code"]))
     for line in pkg_data["pkgchk"]["stderr_lines"]:
       logger.warn(line)
 

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