From 7cb5f2963a2c96e960fc8b39c64e0a6931ca9b3d Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Thu, 09 Dec 2010 17:07:39 +0000 Subject: This prevented activities with similar bundle-id from installation http://lists.sugarlabs.org/archive/sugar-devel/2010-December/029129.html Revert "restore sugar-launch by bundle id substring, fixes #897" This reverts commit 2bbe3b252a4043cb3a0ddda8ef4ba7099a695a81. --- diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index 1060aff..d48c071 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -159,22 +159,12 @@ class BundleRegistry(gobject.GObject): self._write_favorites_file() def get_bundle(self, bundle_id): - """Returns a bundle given service name or substring, - returns None if there is either no match, or more than one - match by substring.""" - result = [] - key = bundle_id.lower() - + """Returns an bundle given his service name""" for bundle in self._bundles: - name = bundle.get_bundle_id() - if name == bundle_id: + if bundle.get_bundle_id() == bundle_id: return bundle - if key in name.lower(): - result.append(bundle) - if len(result) == 1: - return result[0] return None - + def __iter__(self): return self._bundles.__iter__() -- cgit v0.9.1