summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config/mv_common.py
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2013-09-18 17:21:27 (GMT)
committerBritney Fransen <brfransen@gmail.com>2013-09-18 17:21:27 (GMT)
commit0af3b7dc2646ab0e4791e2c634eefd36510ddaab (patch)
tree665dfa19320c907179d5ccc1d8f8b1ccafca286e /abs/core/LinHES-config/mv_common.py
parentfeeab4e304d49176eb57ecfd7eb291055368f284 (diff)
downloadlinhes_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/mv_common.py')
-rwxr-xr-xabs/core/LinHES-config/mv_common.py4
1 files changed, 2 insertions, 2 deletions
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)