X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FSoftwareManager%2FSoftwareTools.py;h=87f0a4d6e11b5d7ac7f6a6d7ea7ae105dedc0303;hp=ee0bec74320f84a6403bdc53090966db25eab88e;hb=e1cd84473da2da0d23f4cea1d4143f17a8fb5a2c;hpb=1b50c31e8c9a2d690500feac0065fd1ace941c80

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
index ee0bec7..87f0a4d 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
@@ -205,7 +205,7 @@ class SoftwareTools(DreamInfoHandler):
 		if self.list_updating:
 			if not self.UpdateConsole:
 				self.UpdateConsole = Console()
-			cmd = "ipkg list"
+			cmd = "opkg list"
 			self.UpdateConsole.ePopen(cmd, self.IpkgListAvailableCB, callback)
 
 	def IpkgListAvailableCB(self, result, retval, extra_args = None):
@@ -241,7 +241,7 @@ class SoftwareTools(DreamInfoHandler):
 			if self.NetworkConnectionAvailable == True:
 				if not self.UpdateConsole:
 					self.UpdateConsole = Console()
-				cmd = "ipkg install enigma2-meta enigma2-plugins-meta enigma2-skins-meta"
+				cmd = "opkg install enigma2-meta enigma2-plugins-meta enigma2-skins-meta"
 				self.UpdateConsole.ePopen(cmd, self.InstallMetaPackageCB, callback)
 			else:
 				self.InstallMetaPackageCB(True)
@@ -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 = "ipkg list_installed"
+			cmd = "opkg list-installed"
 			self.UpdateConsole.ePopen(cmd, self.IpkgListInstalledCB, callback)
 
 	def IpkgListInstalledCB(self, result, retval, extra_args = None):
@@ -331,7 +330,7 @@ class SoftwareTools(DreamInfoHandler):
 	def startIpkgUpdate(self, callback = None):
 		if not self.Console:
 			self.Console = Console()
-		cmd = "ipkg update"
+		cmd = "opkg update"
 		self.Console.ePopen(cmd, self.IpkgUpdateCB, callback)
 
 	def IpkgUpdateCB(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()
@@ -366,4 +366,4 @@ class SoftwareTools(DreamInfoHandler):
 				return False
 		return True
 
-iSoftwareTools = SoftwareTools()
\ No newline at end of file
+iSoftwareTools = SoftwareTools()