diff options
author | Simon Schampijer <simon@schampijer.de> | 2010-12-09 17:07:39 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2010-12-09 17:07:39 (GMT) |
commit | 7cb5f2963a2c96e960fc8b39c64e0a6931ca9b3d (patch) | |
tree | 7de24e9871d1347eea6081300777755039246e89 | |
parent | 00e7bf0df597575455fc1cacd0096390fa17813f (diff) |
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.
-rw-r--r-- | src/jarabe/model/bundleregistry.py | 16 |
1 files changed, 3 insertions, 13 deletions
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__() |