Bug 1176642 - Import proper mozinfo package; r=me
authorGregory Szorc <gps@mozilla.com>
Thu, 25 Jun 2015 16:11:22 -0700
changeset 281000 b57706580b6ad0be4217d93874ca4839b377ba12
parent 280999 84af61ed4887a0cdb0968e3e4bc5c6f36132e3ce
child 281001 e216d138b9df64431a213d114e3d35207c59ef10
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1176642
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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.
python/mozbuild/mozbuild/base.py
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -272,17 +272,17 @@ class MozbuildObject(ProcessExecutionMix
         return self.config_environment.substs
 
     @property
     def distdir(self):
         return os.path.join(self.topobjdir, 'dist')
 
     @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')
 
     @property
     def includedir(self):
         return os.path.join(self.topobjdir, 'dist', 'include')