diff options
| author | Britney Fransen <brfransen@gmail.com> | 2013-09-18 17:21:27 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2013-09-18 17:21:27 (GMT) |
| commit | 0af3b7dc2646ab0e4791e2c634eefd36510ddaab (patch) | |
| tree | 665dfa19320c907179d5ccc1d8f8b1ccafca286e /abs/core/LinHES-config | |
| parent | feeab4e304d49176eb57ecfd7eb291055368f284 (diff) | |
| download | linhes_pkgbuild-0af3b7dc2646ab0e4791e2c634eefd36510ddaab.zip linhes_pkgbuild-0af3b7dc2646ab0e4791e2c634eefd36510ddaab.tar.gz linhes_pkgbuild-0af3b7dc2646ab0e4791e2c634eefd36510ddaab.tar.bz2 | |
LinHES-config: fix pacman -f cmds since pacman 4.1 doesn't support -f, only --force
Diffstat (limited to 'abs/core/LinHES-config')
| -rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 6 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_common.py | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_supplemental.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index a756d3d..e452add 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.0 -pkgrel=6 +pkgrel=7 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -156,7 +156,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c' '3d1e4a119f38cff0498bf8a67e94e4b3' '2506860a416e1988934225d80d501c2c' 'c0549457750c4f8e8038d904a0f3012a' - '3d1e3c7315881a109fb089a540d2262c' + '075fe16ef92621ce31f41df5c5577daf' 'b845de3e05c1734cce4b9ac5e8f1baaf' '31ad5416bf2ab1909338a16035941127' '8b7dce4a3a0a281fa6656aa8781a648e' @@ -166,7 +166,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c' '3eec99951c01d1a1abf7ecfeb33f922b' '087a0ef743bc8af915503f8773536ce4' '183a11aa06d60065106472ed9f72cc4a' - 'b4900090d841d3e390cb840cf16afd85' + 'b2c63ca687a460844fa6f8dabf55f750' '299c24c0820fc9c483c820db2595e3cb' 'cf51cb22e23218ae7e9b55cac1ba3a7f' 'e4b61402858058f7575b776d62d5ee89' diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index 432c270..ff2ee9f 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -229,7 +229,7 @@ def pacinstall(pkg): elif pkg == "xymonclient": if os.path.exists('/home/xymon/client'): - cmd='''pacman --noconfirm --dbonly -Sddf xymonclient''' + cmd='''pacman --noconfirm --dbonly -Sdd --force xymonclient''' runcmd(cmd) if not pkg_blacklist_check(pkg): @@ -237,7 +237,7 @@ def pacinstall(pkg): logging.info(" %s is already installed, will not install",pkg) else: logging.info(" Installing %s",pkg) - cmd ='''pacman --noconfirm -Sf %s ''' %pkg + cmd ='''pacman --noconfirm -S --force %s ''' %pkg runcmd(cmd) else: logging.info(" %s is blacklisted, will not install",pkg) diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py index 2b8bd2f..2699b3b 100755 --- a/abs/core/LinHES-config/mv_supplemental.py +++ b/abs/core/LinHES-config/mv_supplemental.py @@ -41,9 +41,9 @@ def supplemental(systemconfig,this_is_install = False): logging.info(" Installing supplemental system\n") if this_is_install == True: if os.path.exists('/home/xymon/server'): - cmd='''pacman --noconfirm --dbonly -Sddf xymonserver''' + cmd='''pacman --noconfirm --dbonly -Sdd --force xymonserver''' mv_common.runcmd(cmd) cmd='''/usr/LH/bin/install_supplemental_service.sh''' mv_common.runcmd(cmd) - logging.info("__End of supplemental\n")
\ No newline at end of file + logging.info("__End of supplemental\n") |