Skip to content
Snippets Groups Projects
Commit e5fc1c48 authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

Ensure all our temporary directories have useful names.

parent 1964504d
No related branches found
No related tags found
No related merge requests found
......@@ -51,7 +51,7 @@ class AndroidBootImgContainer(Archive):
@tool_required("abootimg")
def open_archive(self):
self._members = []
self._unpacked = get_temporary_directory()
self._unpacked = get_temporary_directory(suffix="android")
logger.debug(
"Extracting Android boot image to %s", self._unpacked.name
......
......@@ -46,7 +46,7 @@ class ApkContainer(Archive):
@tool_required("zipinfo")
def open_archive(self):
self._members = []
self._tmpdir = get_temporary_directory()
self._tmpdir = get_temporary_directory(suffix="apk")
self._unpacked = os.path.join(
self._tmpdir.name, os.path.basename(self.source.name)
)
......
......@@ -52,7 +52,7 @@ class PGPContainer(Archive):
# Extract to a fresh temporary directory so that we can use the
# embedded filename.
self._temp_dir = get_temporary_directory()
self._temp_dir = get_temporary_directory(suffix="pgp")
try:
our_check_output(
......
......@@ -161,7 +161,7 @@ class RdbFile(File):
FILE_EXTENSION_SUFFIX = {".rdb"}
def compare_details(self, other, source=None):
with get_temporary_directory() as tmpdir:
with get_temporary_directory(suffix="rdb") as tmpdir:
a = get_module_path_for_rdb(self, tmpdir)
b = get_module_path_for_rdb(other, tmpdir)
......
......@@ -74,7 +74,7 @@ def get_rpm_header(path, ts):
def compare_rpm_headers(path1, path2):
# compare headers
with get_temporary_directory() as rpmdb_dir:
with get_temporary_directory(suffix="rpm") as rpmdb_dir:
rpm.addMacro("_dbpath", rpmdb_dir)
ts = rpm.TransactionSet()
ts.setVSFlags(-1)
......
......@@ -255,7 +255,7 @@ class SquashfsContainer(Archive):
return
self._members = collections.OrderedDict()
self._temp_dir_object = get_temporary_directory()
self._temp_dir_object = get_temporary_directory(suffix="squashfs")
self._temp_dir = self._temp_dir_object.name
logger.debug("Extracting %s to %s", self.source.path, self._temp_dir)
......
......@@ -92,7 +92,9 @@ class ArchiveMember(File):
"Unpacking %s from %s", self._name, self.container.source.name
)
assert self._temp_dir is None
self._temp_dir = get_temporary_directory()
self._temp_dir = get_temporary_directory(
suffix=self.container.__class__.__name__
)
with profile("container_extract", self.container):
self._path = self.container.extract(
self._name, self._temp_dir.name
......
......@@ -290,7 +290,9 @@ class LibarchiveContainer(Archive):
if hasattr(self, "_members"):
return
self._tmpdir_object = get_temporary_directory(suffix=self.__class__.__name__)
self._tmpdir_object = get_temporary_directory(
suffix=self.__class__.__name__
)
tmpdir = self._tmpdir_object.name
self._members = collections.OrderedDict()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment