From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 6 Nov 2018 08:25:36 +0000 (-0800)
Subject: Fix wrong type to link_output
X-Git-Tag: v5~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F282%2Fhead;p=thirdparty%2Fmkosi.git

Fix wrong type to link_output

$ sudo mkosi --default /dev/null -d fedora -r 29 -t directory -p dnf
...
Traceback (most recent call last):
  File "/bin/mkosi", line 3959, in <module>
    main()
  File "/bin/mkosi", line 3949, in main
    build_stuff(args)
  File "/bin/mkosi", line 3809, in build_stuff
    link_output(args, workspace, raw or tar)
  File "/bin/mkosi", line 2478, in link_output
    os.rename(os.path.join(workspace, "root"), args.output)
  File "/usr/lib64/python3.7/posixpath.py", line 80, in join
    a = os.fspath(a)
TypeError: expected str, bytes or os.PathLike object, not TemporaryDirectory
---

diff --git a/mkosi b/mkosi
index a78b71ff4..0800bd329 100755
--- a/mkosi
+++ b/mkosi
@@ -3718,7 +3718,7 @@ def build_stuff(args: CommandLineArguments) -> None:
     signature = calculate_signature(args, checksum)
     bmap = calculate_bmap(args, raw)
 
-    link_output(args, workspace, raw or tar)
+    link_output(args, workspace.name, raw or tar)
 
     link_output_root_hash_file(args, root_hash_file.name if root_hash_file is not None else None)