Merge commit 'dm/experimental' into test branch

[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / SoftwareManager / SoftwareTools.py

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
index ec2f82c..13c6f90 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
@@ -104,7 +104,7 @@ class SoftwareTools(DreamInfoHandler):
 
        def getUpdates(self, callback = None):
                if self.lastDownloadDate is None:
-                       if  self.hardware_info.device_name != "dm7025":
+                       if 0:
                                etpm = eTPM()
                                l2cert = etpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
                                if l2cert is None:
@@ -123,7 +123,7 @@ class SoftwareTools(DreamInfoHandler):
                                        return
                                val = etpm.challenge(rnd)
                                result = decrypt_block(val, l3key)
-                       if self.hardware_info.device_name == "dm7025" or result[80:88] == rnd:
+                       if 1:
                                if self.NetworkConnectionAvailable == True:
                                        self.lastDownloadDate = time()
                                        if self.list_updating is False and callback is None:
@@ -162,7 +162,7 @@ class SoftwareTools(DreamInfoHandler):
                                        self.NotifierCallback = callback
                        else:
                                if self.list_updating and callback is not None:
-                                       if  self.hardware_info.device_name != "dm7025":
+                                       if 0:
                                                etpm = eTPM()
                                                l2cert = etpm.getCert(eTPM.TPMD_DT_LEVEL2_CERT)
                                                if l2cert is None:
@@ -181,7 +181,7 @@ class SoftwareTools(DreamInfoHandler):
                                                        return
                                                val = etpm.challenge(rnd)
                                                result = decrypt_block(val, l3key)
-                                       if self.hardware_info.device_name == "dm7025" or result[80:88] == rnd:
+                                       if self.hardware_info.device_name == "dm500hd" or result[80:88] == rnd:
                                                self.NotifierCallback = callback
                                                self.startIpkgListAvailable()
                                else: