RSYNC CORE:

resync core-testing -> core

Signed-off-by: James Meyer <james.meyer@operamail.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index a492597..0272809 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -1,9 +1,34 @@
 # -*- coding: utf-8 -*-
 import logging, os, time
 import commands
+import ConfigParser
 config_file = "mv_config"
 data_config = __import__(config_file, globals(), locals(), [])
 
+module_config = ConfigParser.RawConfigParser()
+try:
+    module_config.read('/etc/mythvantage.cfg')
+except:
+    logging.info("couldn't read mythvantage.cfg")
+
+
+def read_config(module_config,data):
+    rvalue = True
+    section = "mythvantage"
+    try:
+        rvalue = module_config.get(section, data)
+        if rvalue == "False":
+            rvalue = False
+        if rvalue == "no":
+            rvalue = False
+
+
+    except:
+        logging.debug("Couldn't read mythvantage.cfg")
+        rvalue = True
+
+    return rvalue
+
 def runcmd(cmd):
     if data_config.NOOPDEBUG=="FALSE":
         pass
@@ -107,6 +132,8 @@ def pacinstall(pkg):
         add_service("webmin")
     elif pkg == "fuppes":
         pacinstall("fuppes-svn")
+    elif pkg == "mupen64":
+        pacinstall("mupen64plus-svn")
 
     if  not pkg_blacklist_check(pkg):
         if pkg_installed_check(pkg):
@@ -126,6 +153,10 @@ def pacremove(pkg):
         pacremove("libdvdcss")
     elif pkg == "webmin":
         remove_service("webmin")
+    elif pkg == "fuppes":
+        pacremove("fuppes-svn")
+    elif pkg == "mupen64":
+        pacremove("mupen64plus-svn")
 
     if  not pkg_blacklist_check(pkg):
         if not pkg_installed_check(pkg):