From: Chris Larson Date: Wed, 8 Apr 2009 17:12:51 +0000 (-0700) Subject: collections.inc: trim off trailing slashes for the entries in COLLECTIONS. X-Git-Tag: Release-2010-05/1~3789^2~8^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b215f7a41ce9e6b1b32cf10b1f0da1a30ae9f26;p=openembedded.git collections.inc: trim off trailing slashes for the entries in COLLECTIONS. Signed-off-by: Chris Larson --- 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)