Skip to content

Commit

Permalink
Move build.flags['shoutcast_internal'] assignment to enabled to avo…
Browse files Browse the repository at this point in the history
…id a KeyError in `sources` when `configure` is skipped.
  • Loading branch information
rryan committed Dec 22, 2019
1 parent 7229998 commit 5a0e711
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ def description(self):

def enabled(self, build):
build.flags['shoutcast'] = util.get_flags(build.env, 'shoutcast', 1)
build.flags['shoutcast_internal'] = util.get_flags(build.env, 'shoutcast_internal', 0)
if int(build.flags['shoutcast']):
return True
return False
Expand All @@ -696,7 +697,6 @@ def configure(self, build, conf):

build.env.Append(CPPDEFINES='__BROADCAST__')

build.flags['shoutcast_internal'] = util.get_flags(build.env, 'shoutcast_internal', 0)
if build.platform_is_linux and not int(build.flags['shoutcast_internal']):
# Check if system lib is lower 2.4.2 or 2.4.3 and not suffering bug
# https://bugs.launchpad.net/mixxx/+bug/1833225
Expand Down

2 comments on commit 5a0e711

@daschuer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit make 'shoutcast_internal' allways 0, because enabled() is called after configure() again. I will prepare a fix.

@daschuer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See: #2438

Please sign in to comment.