Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-05 23:14:07 +01:00
Code Issues Projects Releases Wiki Activity

El Capitan fix

Browse source
This commit is contained in:
Adrian Sampson 2015-07-13 16:16:33 -07:00
parent ae68cedeaf
commit 9aad2115e0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
beets/util/__init__.py
View file

@ -660,8 +660,8 @@ def cpu_count():
num = 0
elif sys.platform == b'darwin':
try:
num = int(command_output([b'sysctl', b'-n', b'hw.ncpu']))
except ValueError:
num = int(command_output([b'/usr/sbin/sysctl', b'-n', b'hw.ncpu']))
except (ValueError, OSError, subprocess.CalledProcessError):
num = 0
else:
try:

2
docs/changelog.rst
View file

@ -71,6 +71,8 @@ Fixes:
* Fix an edge case when producing sanitized filenames where the maximum path
length conflicted with the :ref:`replace` rules. Thanks to Ben Ockmore.
:bug:`496` :bug:`1361`
* Fix an incompatibility with OS X 10.11 (where ``/usr/sbin`` seems not to be
on the user's path by default).
1.3.13 (April 24, 2015)