Fixup for bug 1024620 on a CLOSED TREE. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 14 Jun 2014 09:24:39 +0900
changeset 188733 1d0eb8fb8d87660b4fcac6f5dbac53737469b78a
parent 188732 756d3d9456c3f412aaffdbe67f704aa8178e089c
child 188734 ca5b7ed0dd5ae7ed22f29de1fe71240737cfb468
push idunknown
push userunknown
push dateunknown
reviewersme
bugs1024620
milestone33.0a1
Fixup for bug 1024620 on a CLOSED TREE. r=me
config/expandlibs_exec.py
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -104,17 +104,17 @@ class ExpandArgsMore(ExpandArgs):
                     basedir = os.path.dirname(arg)
                     for root, dirs, files in os.walk(tmp):
                         for f in files:
                             if isObject(f):
                                 # If the file extracted from the library also
                                 # exists in the directory containing the
                                 # library, or one of its subdirectories, use
                                 # that instead.
-                                maybe_obj = lookup(os.path.join(basedir, os.path.relpath(root, tmp), f)
+                                maybe_obj = lookup(os.path.join(basedir, os.path.relpath(root, tmp)), f)
                                 if maybe_obj:
                                     objs.append(relativize(maybe_obj))
                                 else:
                                     objs.append(relativize(os.path.join(root, f)))
                     newlist += sorted(objs)
                     continue
             newlist += [arg]
         return newlist