Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2932 from ertugerata/master

Browse Source 
fix file conflicts
This commit is contained in:
Ertuğrul Erata
2017-02-20 13:30:19 +02:00
committed by GitHub
parent 2d9b942e81 122f1bf40c
commit 7058453f98
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/shell/bash-completion/actions.py
+3 -3
View File
@@ -20,8 +20,8 @@ def install():
autotools.rawInstall('DESTDIR=%s' % get.installDIR()) autotools.rawInstall('DESTDIR=%s' % get.installDIR())
# provided by util-linux , networkmanager , remove Slackware's makepkg completion # 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"] blacklist = ["mount", "umount", "hd", "ncal", "makepkg"]
#for comp in blacklist: for comp in blacklist:
#pisitools.remove("/usr/share/bash-completion/completions/%s" % comp) pisitools.remove("/usr/share/bash-completion/completions/%s" % comp)
pisitools.dodoc("AUTHORS", "CHANGES", "COPYING", "README.md") pisitools.dodoc("AUTHORS", "CHANGES", "COPYING", "README.md")