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

[wahwah at users.sourceforge.net]

Revision: 17687
          http://gar.svn.sourceforge.net/gar/?rev=17687&view=rev
Author:   wahwah
Date:     2012-04-15 08:30:00 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
checkpkg: Tolerate file names with unicode

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	2012-04-15 08:11:10 UTC (rev 17686)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2012-04-15 08:30:00 UTC (rev 17687)
@@ -502,11 +502,15 @@
   reasons_to_be_arch_specific = []
   pkgmap_paths = [x["path"] for x in pkgmap]
   for pkgmap_path in pkgmap_paths:
-    if re.search(ARCH_RE, str(pkgmap_path)):
-      reasons_to_be_arch_specific.append((
-          "archall-with-arch-paths",
-          pkgmap_path,
-          "path %s looks arch-specific" % pkgmap_path))
+    try:
+      path_str = str(pkgmap_path)
+      if re.search(ARCH_RE, path_str):
+        reasons_to_be_arch_specific.append((
+            "archall-with-arch-paths",
+            pkgmap_path,
+            "path %s looks arch-specific" % pkgmap_path))
+    except UnicodeDecodeError, e:
+      logging.warning(e)
   for binary in binaries:
     reasons_to_be_arch_specific.append((
         "archall-with-binaries",

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