X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FSoftwareManager%2FSoftwareTools.py;h=a851875846134bdada1ab7e961a18ad0209df97c;hb=023864f9fe2db4ef8f74057b1afb21446b6b7ef7;hp=8b8fc97c4fcfaa698d05d5528b6f50d304c53a3d;hpb=f32b288b3236e41686e67eda2bccf2f083223bca;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
index 8b8fc97..a851875 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
@@ -101,7 +101,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:
@@ -120,7 +120,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:
@@ -159,7 +159,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:
@@ -178,7 +178,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:	
@@ -264,13 +264,12 @@ class SoftwareTools(DreamInfoHandler):
 						callback(False)
 
 	def startIpkgListInstalled(self, callback = None):
-		print "STARTIPKGLISTINSTALLED"
 		if callback is not None:
 			self.list_updating = True
 		if self.list_updating:
 			if not self.UpdateConsole:
 				self.UpdateConsole = Console()
-			cmd = "opkg list_installed"
+			cmd = "opkg list-installed"
 			self.UpdateConsole.ePopen(cmd, self.IpkgListInstalledCB, callback)
 
 	def IpkgListInstalledCB(self, result, retval, extra_args = None):
@@ -344,6 +343,7 @@ class SoftwareTools(DreamInfoHandler):
 						callback = None
 
 	def cleanupSoftwareTools(self):
+		self.list_updating = False
 		if self.NotifierCallback is not None:
 			self.NotifierCallback = None
 		self.ipkg.stop()