From 92e69005c216326847cbc7da12851ec7bc171563 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 16 May 2010 14:38:19 +0100 Subject: [PATCH] Canonicalise machine name in distro.py --- zeroinstall/injector/distro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeroinstall/injector/distro.py b/zeroinstall/injector/distro.py index 03ee5c6..f359d66 100644 --- a/zeroinstall/injector/distro.py +++ b/zeroinstall/injector/distro.py @@ -252,7 +252,7 @@ _canonical_machine = { 'i386': 'i386', } -host_machine = os.uname()[-1] +host_machine = arch.canonicalize_machine(os.uname()[-1]) def canonical_machine(package_machine): machine = _canonical_machine.get(package_machine, None) if machine is None: @@ -496,7 +496,7 @@ class PortsDistribution(Distribution): name = pkgname[0:match.start()] version = try_cleanup_distro_version(pkgname[match.start() + 1:]) - machine = arch.canonicalize_machine(host_machine) + machine = host_machine impl = factory('package:ports:%s:%s:%s' % \ (package, version, machine)) -- 2.11.4.GIT