From 122f1bf40c0b0e50adeb51f5bb28f65d2acdf38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 20 Feb 2017 13:28:14 +0200 Subject: [PATCH] fix file conflicts:wq --- util/shell/bash-completion/actions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/shell/bash-completion/actions.py b/util/shell/bash-completion/actions.py index 9cb234099d..9ea982456d 100644 --- a/util/shell/bash-completion/actions.py +++ b/util/shell/bash-completion/actions.py @@ -19,9 +19,9 @@ def build(): def install(): autotools.rawInstall('DESTDIR=%s' % get.installDIR()) -# provided by util-linux , networkmanager , remove Slackware's makepkg completion - blacklist = ["cal", "chsh", "dmesg", "eject", "hd", "hexdump", "hwclock", "ionice", "look", "ncal", "nmcli", "newgrp", "makepkg", "renice", "rtcwake", "su"] - #for comp in blacklist: - #pisitools.remove("/usr/share/bash-completion/completions/%s" % comp) + # provided by util-linux , networkmanager , remove Slackware's makepkg completion + blacklist = ["mount", "umount", "hd", "ncal", "makepkg"] + for comp in blacklist: + pisitools.remove("/usr/share/bash-completion/completions/%s" % comp) pisitools.dodoc("AUTHORS", "CHANGES", "COPYING", "README.md")