summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2009-04-08 10:12:51 -0700
committerChris Larson <clarson@kergoth.com>2009-04-08 10:13:28 -0700
commit3b215f7a41ce9e6b1b32cf10b1f0da1a30ae9f26 (patch)
tree62be17e5d34d37b2e9a8737e3a8c274eca8fe6e9 /conf
parent9bf9f5e64e6167d8a42ab960e67bf6fc6a258626 (diff)
collections.inc: trim off trailing slashes for the entries in COLLECTIONS.
Signed-off-by: Chris Larson <clarson@kergoth.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/collections.inc4
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)