diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-04-08 19:23:35 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-08 19:23:35 +0200 |
| commit | 02655ea9a9688994c798de81184cdea4e69a0faa (patch) | |
| tree | fa7c68ea6e0844dc33447e870af3fd0d62741f26 | |
| parent | 6f89098a071d8c1cb87c403a7d2f5f7f3ce14f70 (diff) | |
| parent | 3b215f7a41ce9e6b1b32cf10b1f0da1a30ae9f26 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/collections.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/collections.inc b/conf/collections.inc index e3f6883418..abd9bd383b 100644 --- a/conf/collections.inc +++ b/conf/collections.inc @@ -91,13 +91,15 @@ def collections_setup(d): collectionmap = {} namemap = {} for collection in collections: + if collection.endswith(os.sep): + collection = collection[:-1] basename = os.path.basename(collection).split(os.path.extsep)[0] if namemap.get(basename): basename = "%s-%s" % (basename, hash(collection)) namemap[basename] = collection collectionmap[collection] = basename - for (collection, priority) in izip(collections, xrange(len(collections), 0, -1)): + for (collection, priority) in izip(collectionmap, xrange(len(collections), 0, -1)): if not os.path.exists(collection): bb.fatal("Collection %s does not exist" % collection) |