diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-01-22 18:17:02 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-01-22 18:17:02 (GMT) |
| commit | 51975d8ccdf7ab35af856ab6ca0a99d240f97524 (patch) | |
| tree | cf7cc02756c61a6e1280d7b662dd7f013c60e4c0 | |
| parent | 41271c7d20a9c6d19a58d23c85300b93fc24721a (diff) | |
| download | linhes_pkgbuild-51975d8ccdf7ab35af856ab6ca0a99d240f97524.zip linhes_pkgbuild-51975d8ccdf7ab35af856ab6ca0a99d240f97524.tar.gz linhes_pkgbuild-51975d8ccdf7ab35af856ab6ca0a99d240f97524.tar.bz2 | |
linhes-config: Stop removal of lircd when a remote is not defined, but a blaster is.
refs #798
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 4 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_ir.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index f9ede11..6f21150 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=59 +pkgrel=60 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' @@ -125,7 +125,7 @@ md5sums=('64fad755c12f8eb12940e216e403354e' '5f3259afe031fda189edae41dd1458f0' 'dc150c1e2c915a55a616d1af5bb1f6de' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '4d0464a1bef1819f6f9c100609eb55ad' + '8f58093cc2bbf92c95e54090cf243117' '5e69839659d65ddda35b8a9982dc29e9' '62b4ce94277c32f525db5c1480670acd' 'ec6a9961e4d1b53ec1240c5979efff11' diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index a23b72c..0e54f92 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -80,9 +80,9 @@ def include_file( incfile,filename): f.write("\n") f.close() -def setup_ir_remote(Remotetype,templates,mythhome): +def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): logging.debug(" Setup of remote type %s",Remotetype) - if Remotetype == "no_remote": + if Remotetype == "no_remote" and HostBlasterType == "None" : mv_common.remove_service("lircd") elif Remotetype == "tinker": pass @@ -335,7 +335,7 @@ def setup_ir(systemconfig, data_config): else: remotetype = systemconfig.get("Remotetype") - setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"),data_config.MYTHHOME) + setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"),data_config.MYTHHOME,systemconfig.get("HostBlasterType")) setup_lirc_links(data_config.MYTHHOME) if systemconfig.get("ReceiverType"): |