diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /python/mozbuild/mozpack | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'python/mozbuild/mozpack')
| -rw-r--r-- | python/mozbuild/mozpack/dmg.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozpack/test/test_files.py | 3 | ||||
| -rw-r--r-- | python/mozbuild/mozpack/test/test_unify.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/python/mozbuild/mozpack/dmg.py b/python/mozbuild/mozpack/dmg.py index 4e094648fe..6be813524f 100644 --- a/python/mozbuild/mozpack/dmg.py +++ b/python/mozbuild/mozpack/dmg.py @@ -11,7 +11,7 @@ from typing import List import mozfile -from mozbuild.util import ensureParentDir +from mozbuild.dirutils import ensureParentDir is_linux = platform.system() == "Linux" is_osx = platform.system() == "Darwin" diff --git a/python/mozbuild/mozpack/test/test_files.py b/python/mozbuild/mozpack/test/test_files.py index 1c86f2e0cc..cfa2cd8ffe 100644 --- a/python/mozbuild/mozpack/test/test_files.py +++ b/python/mozbuild/mozpack/test/test_files.py @@ -2,7 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -from mozbuild.util import ensure_bytes, ensureParentDir +from mozbuild.dirutils import ensureParentDir +from mozbuild.util import ensure_bytes from mozpack.errors import ErrorMessage, errors from mozpack.files import ( AbsoluteSymlinkFile, diff --git a/python/mozbuild/mozpack/test/test_unify.py b/python/mozbuild/mozpack/test/test_unify.py index 15de50dccc..b2c3073f03 100644 --- a/python/mozbuild/mozpack/test/test_unify.py +++ b/python/mozbuild/mozpack/test/test_unify.py @@ -8,7 +8,7 @@ from io import StringIO import mozunit -from mozbuild.util import ensureParentDir +from mozbuild.dirutils import ensureParentDir from mozpack.errors import AccumulatedErrors, ErrorMessage, errors from mozpack.files import FileFinder from mozpack.mozjar import JarWriter |