While cleaning up host arch for solving, take into account noarch

2 files changed, 8 insertions, 3 deletions

diff --git a/sugar_network/client/solver.py b/sugar_network/client/solver.py
index 9e11eb8..1155fe8 100644
--- a/sugar_network/client/solver.py
+++ b/sugar_network/client/solver.py
@@ -22,11 +22,11 @@ from sugar_network.toolkit import http, util, lsb_release, pipe, exception
 
 sys.path.insert(0, join(dirname(__file__), '..', 'lib', 'zeroinstall'))
 
-from zeroinstall.injector import reader, model
+from zeroinstall.injector import reader, model, arch as _arch
 from zeroinstall.injector.config import Config
 from zeroinstall.injector.driver import Driver
 from zeroinstall.injector.requirements import Requirements
-from zeroinstall.injector.arch import canonicalize_machine, machine_ranks
+from zeroinstall.injector.arch import machine_ranks
 # pylint: disable-msg=W0611
 from zeroinstall.injector.distro import try_cleanup_distro_version
 
@@ -43,6 +43,11 @@ reader.update_from_cache = lambda * args, ** kwargs: None
 _logger = logging.getLogger('zeroinstall')
 
 
+def canonicalize_machine(arch):
+    result = _arch.canonicalize_machine(arch)
+    return None if arch in ('noarch', 'all') else result
+
+
 def select_architecture(arches):
     """Select most appropriate, for the host system, machine architecture
 
diff --git a/sugar_network/toolkit/util.py b/sugar_network/toolkit/util.py
index 04f1bb9..470fb4f 100644
--- a/sugar_network/toolkit/util.py
+++ b/sugar_network/toolkit/util.py
@@ -127,7 +127,7 @@ def parse_version(version_string):
         for x in range(0, length, 2):
             part = parts[x]
             if part:
-                parts[x] = [int(i) for i in parts[x].split('.')]
+                parts[x] = [int(i or '0') for i in part.split('.')]
             else:
                 parts[x] = []  # (because ''.split('.') == [''], not [])
         for x in range(1, length, 2):