at 22.05-pre 43 lines 1.7 kB view raw
1diff --git i/beets/ui/commands.py w/beets/ui/commands.py 2index 4d010f4b..0b023585 100755 3--- i/beets/ui/commands.py 4+++ w/beets/ui/commands.py 5@@ -1741,20 +1741,6 @@ default_commands.append(config_cmd) 6 def print_completion(*args): 7 for line in completion_script(default_commands + plugins.commands()): 8 print_(line, end=u'') 9- if not any(map(os.path.isfile, BASH_COMPLETION_PATHS)): 10- log.warning(u'Warning: Unable to find the bash-completion package. ' 11- u'Command line completion might not work.') 12- 13-BASH_COMPLETION_PATHS = map(syspath, [ 14- u'/etc/bash_completion', 15- u'/usr/share/bash-completion/bash_completion', 16- u'/usr/local/share/bash-completion/bash_completion', 17- # SmartOS 18- u'/opt/local/share/bash-completion/bash_completion', 19- # Homebrew (before bash-completion2) 20- u'/usr/local/etc/bash_completion', 21-]) 22- 23 24 def completion_script(commands): 25 """Yield the full completion shell script as strings. 26diff --git i/test/test_ui.py w/test/test_ui.py 27index 5cfed1fd..9d3dc458 100644 28--- i/test/test_ui.py 29+++ w/test/test_ui.py 30@@ -1230,12 +1230,7 @@ class CompletionTest(_common.TestCase, TestHelper): 31 stdout=subprocess.PIPE, env=env) 32 33 # Load bash_completion library. 34- for path in commands.BASH_COMPLETION_PATHS: 35- if os.path.exists(util.syspath(path)): 36- bash_completion = path 37- break 38- else: 39- self.skipTest(u'bash-completion script not found') 40+ self.skipTest(u'bash-completion script not found') 41 try: 42 with open(util.syspath(bash_completion), 'rb') as f: 43 tester.stdin.writelines(f)