From c6b433cf97c4fe42ad3191a1700dba6a86327700 Mon Sep 17 00:00:00 2001 From: skyjake Date: Fri, 30 Mar 2012 15:17:02 +0300 Subject: [PATCH] Builder|Fixed: Detecting platform from package filename The 32-bit .dmg and the 64-bit .dmg were being treated as both being for the 10.4+ platform. --- distrib/builder/event.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/distrib/builder/event.py b/distrib/builder/event.py index 671c38707b..dc5f258fc3 100644 --- a/distrib/builder/event.py +++ b/distrib/builder/event.py @@ -65,10 +65,11 @@ def package_from_filename(self, name): return 'doomsday' def os_from_filename(self, name): + found = None for n, ext, ident in self.oses: if name.endswith(ext) or ident in name: - return (n, ext, ident) - return None + found = (n, ext, ident) + return found def version_from_filename(self, name): ver = self.extract_version_from_filename(name) @@ -239,7 +240,7 @@ def html_description(self, encoded=True): # Find the binaries for this OS. binaries = [] for f in files: - if osExt in f: + if self.os_from_filename(f)[2] == osIdent: binaries.append(f) if not binaries: