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

[wahwah at users.sourceforge.net]

Revision: 20929
          http://gar.svn.sourceforge.net/gar/?rev=20929&view=rev
Author:   wahwah
Date:     2013-05-01 23:12:03 +0000 (Wed, 01 May 2013)
Log Message:
-----------
checkpkg: Display expected 64-bit bin locations

Just to make it a little clearer what is checkpkg thinking.

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	2013-05-01 19:07:10 UTC (rev 20928)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-05-01 23:12:03 UTC (rev 20929)
@@ -1240,19 +1240,20 @@
 
   if binaries:
     paths_64 = {
-    	  'i386': common_constants.AMD64_PATHS,
+        'i386': common_constants.AMD64_PATHS,
         'sparc': common_constants.SPARCV9_PATHS,
     }
-    paths_64_re = re.compile(r"opt/csw/(%s)/(%s)" %
-                             (binaries_path,
-                              '|'.join(paths_64[pkginfo['ARCH']])))
+    paths_64_str = (
+        r"opt/csw/(%s)/(%s)"
+        % (binaries_path, '|'.join(paths_64[pkginfo['ARCH']])))
+    paths_64_re = re.compile(paths_64_str)
     for binary_info in binaries:
       if paths_64_re.search(binary_info['path']):
-          return
+        return
 
     error_mgr.ReportError('64bits-binaries-missing')
     messenger.Message(
       "The package is supposed to contains 64 bits binaries "
       "but it doesn't contain any in the usual 64 bits "
-      "binaries locations.")
+      "binaries locations. Locations checked: %s." % paths_64_str)
 

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