diff options
author | James Meyer <james.meyer@operamail.com> | 2014-10-19 23:10:03 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2014-10-19 23:10:03 (GMT) |
commit | a2ab677040c35b12c2554f3b4aa1cbbdaaa336eb (patch) | |
tree | d4f34cf11e339891a079e3e5bfe9fb6c0211cf20 /abs/core/LinHES-config/mv_ir.py | |
parent | c31220cf9458daf319ab22eff1b0f2dbba57e147 (diff) | |
download | linhes_pkgbuild-a2ab677040c35b12c2554f3b4aa1cbbdaaa336eb.zip linhes_pkgbuild-a2ab677040c35b12c2554f3b4aa1cbbdaaa336eb.tar.gz linhes_pkgbuild-a2ab677040c35b12c2554f3b4aa1cbbdaaa336eb.tar.bz2 |
LinHES-config: fix remotes starting when it shouldn't. This was due to not checking all the correct values for the blaster type
Fix upgrades for the new system images
Diffstat (limited to 'abs/core/LinHES-config/mv_ir.py')
-rwxr-xr-x | abs/core/LinHES-config/mv_ir.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index 1eae985..c4386cc 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -87,7 +87,9 @@ def include_file( incfile,filename): def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): logging.debug(" Setup of remote type %s",Remotetype) - if Remotetype == "no_remote" and HostBlasterType == "None" : + #if Remotetype == "no_remote" and HostBlasterType == "None" : + HostBlasterType_values=["None",""] + if Remotetype == "no_remote" and (HostBlasterType in HostBlasterType_values) : mv_common.remove_service("remotes") elif Remotetype == "tinker": pass #do nothing @@ -139,7 +141,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): #if remote has a special xbmc file, use it. xbmcfile= remote_path + "/xbmc.xml" userxmbcfile = mythhome+"/.xbmc/userdata/Lircmap.xml" - + if os.path.exists(xbmcfile): logging.debug(" XBMC lirc file present") logging.info(" Setting up lirc for xbmc") @@ -153,7 +155,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): os.mkdir(mythhome+"/.xbmc/userdata/") except: logging.debug(" Couldn't create .xbmc/userdata ") - + try: cmd = ''' chown -R mythtv %s/.xbmc''' %mythhome mv_common.runcmd(cmd) @@ -161,7 +163,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): mv_common.runcmd(cmd) except: logging.debug(" Couldn't change permissions for .xbmc") - pass + pass try: cmd = ''' rm -f %s''' %(userxmbcfile) mv_common.runcmd(cmd) @@ -171,12 +173,12 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): pass else: logging.debug(" XBMC lirc file %s not present" %xbmcfile) - - - - - - + + + + + + #remote has it's own modprobe.d/conf filename cmd = "rm -f /etc/modprobe.d/mv_ir.conf" |