MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Agate 2020-06-11 10:35:15 +02:00
parent d145edcd30 02f7582747
commit 1668dc4f59
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/music/management/commands/import_files.py
View File

@ -37,7 +37,7 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
yield entry.path yield entry.path
elif recursive and entry.is_dir(): elif recursive and entry.is_dir():
yield from crawl_dir( yield from crawl_dir(
entry, extensions, recursive=recursive, ignored=ignored entry.path, extensions, recursive=recursive, ignored=ignored
) )
finally: finally:
if hasattr(scanner, "close"): if hasattr(scanner, "close"):

1
changes/changelog.d/1155.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed crash on python 3.5 with cli importer (#1155)