edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dmg.py

Browse source 
Traceback (most recent call last):
  File "/home/deen/isos/ddnet/ddnet-source/scripts/dmg.py", line 106, in <module>
    main()
  File "/home/deen/isos/ddnet/ddnet-source/scripts/dmg.py", line 103, in main
    dmg.create(volume_name=args.volume_name, directory=args.directory, dmg=args.output, symlinks=symlinks)
  File "/home/deen/isos/ddnet/ddnet-source/scripts/dmg.py", line 59, in create
    self._create_hfs(hfs, volume_name, output_size)
  File "/home/deen/isos/ddnet/ddnet-source/scripts/dmg.py", line 42, in _create_hfs
    with open(hfs, 'wb') as f:
TypeError: expected str, bytes or os.PathLike object, not tuple
This commit is contained in:
def 2021-03-04 09:52:59 +01:00
parent f78bbb5864
commit 387b8ef51d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/dmg.py
View file

@ -36,10 +36,10 @@ class Dmgtools(Dmg):
def _dmg(self, *args): def _dmg(self, *args):
self._check_call((self.config.dmg,) + args) self._check_call((self.config.dmg,) + args)
def _create_hfs(self, hfs, volume_name, size): def _create_hfs(self, hfs_fd, hfs, volume_name, size):
if self.config.verbose >= 1: if self.config.verbose >= 1:
print("TRUNCATING {} to {} bytes".format(hfs, size)) print("TRUNCATING {} to {} bytes".format(hfs, size))
with open(hfs, 'wb') as f: with os.fdopen(hfs_fd, 'wb') as f:
f.truncate(size) f.truncate(size)
self._mkfs_hfs('-v', volume_name, hfs) self._mkfs_hfs('-v', volume_name, hfs)
@ -55,8 +55,8 @@ class Dmgtools(Dmg):
def create(self, dmg, volume_name, directory, symlinks): def create(self, dmg, volume_name, directory, symlinks):
input_size = sum(os.stat(os.path.join(path, f)).st_size for path, dirs, files in os.walk(directory) for f in files) input_size = sum(os.stat(os.path.join(path, f)).st_size for path, dirs, files in os.walk(directory) for f in files)
output_size = max(input_size * 2, 1024**2) output_size = max(input_size * 2, 1024**2)
hfs = tempfile.mkstemp(prefix=dmg + '.', suffix='.hfs') hfs_fd, hfs = tempfile.mkstemp(prefix=dmg + '.', suffix='.hfs')
self._create_hfs(hfs, volume_name, output_size) self._create_hfs(hfs_fd, hfs, volume_name, output_size)
self._add(hfs, directory) self._add(hfs, directory)
for target, link_name in symlinks: for target, link_name in symlinks:
self._symlink(hfs, target, link_name) self._symlink(hfs, target, link_name)