зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1176642 - Import proper mozinfo package; r=me
bf34d16b6ab2 added absolute_import to this file. When changed, "import mozinfo" stopped picking up mozbuild.mozinfo and started importing mozinfo instead. Use relative imports to force mozbuild.mozinfo to be picked up. --HG-- extra : commitid : 4GC5lJWrBFq extra : rebase_source : c91674b16f29dadf8dcda460787ea94654f2864a
This commit is contained in:
Родитель
44c8b16ca6
Коммит
d34ee1a5dc
|
@ -277,7 +277,7 @@ class MozbuildObject(ProcessExecutionMixin):
|
|||
|
||||
@property
|
||||
def bindir(self):
|
||||
import mozinfo
|
||||
from . import mozinfo
|
||||
if mozinfo.os == "mac":
|
||||
return os.path.join(self.topobjdir, 'dist', self.substs['MOZ_MACBUNDLE_NAME'], 'Contents', 'Resources')
|
||||
return os.path.join(self.topobjdir, 'dist', 'bin')
|
||||
|
|
Загрузка…
Ссылка в новой задаче