SF.net SVN: gar:[22895] csw/mgar/gar/v2/lib/python/dependency_checks.py

[chninkel at users.sourceforge.net]

Revision: 22895
          http://sourceforge.net/p/gar/code/22895
Author:   chninkel
Date:     2014-01-26 14:27:20 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
gar/v2: fix forbidden-version-interface tests so it correctly handles amd64 binaries included in Solaris 9 packages

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

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2014-01-26 00:29:44 UTC (rev 22894)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2014-01-26 14:27:20 UTC (rev 22895)
@@ -294,8 +294,7 @@
 
     osrel = pkg_data['basic_stats']['parsed_basename']['osrel']
 
-    if (osrel == u'SunOS5.9' and
-        binary_info['path'].endswith('/amd64/' + binary_info['base_name'])):
+    if osrel == u'SunOS5.9' and '/amd64/' in binary_info['path']:
       # amd64 binaries in Solaris 5.9 packages were in fact compiled under
       # Solaris 5.10 so we have a special case here
       osrel = u'SunOS5.10'

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