mirror of https://github.com/xemu-project/xemu.git
tests/boot_linux_console: use os.path for filesystem paths
Change extract_from_deb() to use os.path routines to manipulate the filesystem path returned when extracting a file. Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Signed-off-by: Liam Merwick <liam.merwick@oracle.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <1580914565-19675-7-git-send-email-liam.merwick@oracle.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
76a901d295
commit
921a9f6db8
|
@ -49,7 +49,12 @@ class BootLinuxConsole(Test):
|
||||||
process.run("ar x %s %s" % (deb, file_path))
|
process.run("ar x %s %s" % (deb, file_path))
|
||||||
archive.extract(file_path, self.workdir)
|
archive.extract(file_path, self.workdir)
|
||||||
os.chdir(cwd)
|
os.chdir(cwd)
|
||||||
return self.workdir + path
|
# Return complete path to extracted file. Because callers to
|
||||||
|
# extract_from_deb() specify 'path' with a leading slash, it is
|
||||||
|
# necessary to use os.path.relpath() as otherwise os.path.join()
|
||||||
|
# interprets it as an absolute path and drops the self.workdir part.
|
||||||
|
return os.path.normpath(os.path.join(self.workdir,
|
||||||
|
os.path.relpath(path, '/')))
|
||||||
|
|
||||||
def extract_from_rpm(self, rpm, path):
|
def extract_from_rpm(self, rpm, path):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue