Changeset 4346

Timestamp:

Apr 20, 2017, 8:31:59 AM (2 years ago)

Author:

Juanma

Message:

ZmdManager? bugfix

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py (modified) (8 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py

@@ -39 +39 @@
                 count=len(applist)
                 self.n4dclient=self._n4d_connect()
+                self.result['status']={'status':-1,'msg':''}
+                self.result['data']=[]
                 for appInfo in applist:
                         if not (os.path.exists(self.zmdPath)):
                                 return applist;
-                        if (action):
+                if (action):
                                 if action=='install':
-                                        self._install_Zmd(appInfo)
+                                        self.result['data'].append(self._install_Zmd(appInfo))
                                 if action=='remove':
-                                        self._remove_Zmd(appInfo)
+                                        self.result['data'].append(self._remove_Zmd(appInfo))
                                 if action=='pkginfo':
-                                        self._get_Zmd_Info(appInfo)
+                                        self.result['data'].append(self._get_Zmd_Info(appInfo))
                 self.progress=100
                 return(self.result)
@@ -70 +72 @@
                 zmd=self.zmdPath+'/'+appInfo['package']+'.zmd'
                 self._debug("Installing "+str(zmd))
+                err=0
                 try:
                         zmdsudo=['gksudo',zmd]
-                        print("executing "+str(zmdsudo))
+                        self._debug("executing "+str(zmdsudo))
                         zmdCmd=subprocess.Popen(zmdsudo,stdout=subprocess.PIPE,stdin=subprocess.PIPE,stderr=subprocess.PIPE)
                         zmdLauncher=os.path.basename(zmd)
@@ -78 +81 @@
                         while zmdCmd.poll() is None:
                                 self._callback(zmdLauncher)
-                                time.sleep(0.4)
-                        zmdResult=zmdCmd.stdout.read()
+                                time.sleep(.4
+                        zmdResult=zmdCmdtdout.read()
                         zmdError=zmdCmd.stderr.read()
-                        self._debug("Result: "+str(zmdError))
+                        self._debug("Error: "+str(zmdError))
                         self._debug("Result: "+str(zmdResult))
                         appInfo=self._get_Zmd_Info(appInfo)
-                        if appInfo['status']=='Installed':
-                                self._set_status(0)
-                        else:
-                                self._set_status(5)
+                        if appInfo['status']!='Installed':
+                                err=5
                 except Exception as e:
                         appInfo=self._get_Zmd_Info(appInfo)
                         self._debug(str(e))
-                        if appInfo['status']=='Installed':
-                                self._set_status(0)
-                                self.result['data'].update({appInfo['name']:u'installed'})
-                        else:
-                                self.result['data'].update({appInfo['name']:u'not installed'})
-                                self._set_status(5)
+                        if appInfo['status']!='Installed':
+                                err=5
+                self._set_status(err)
+                return err
         #def _install_Zmd
 
@@ -104 +103 @@
                 os.chdir(self.zmdPath)
                 sw_continue=False
+                err=0
                 try:
                         removePackages=[]
@@ -114 +114 @@
                                         packagelist=packagelist[:-1]
                                         #We've the file with the packagelist, now it's time to read the list
-                                        print("Obtaining packages in : "+packagelist)
+                                        self._debug("Obtaining packages in : "+packagelist)
                                         f2=open  (packagelist,'r')
                                         for line2 in f2:
@@ -125 +125 @@
                         f.close()
                 except Exception as e:
+                        err=7
                         print(str(e))
                 if sw_continue:
@@ -148 +149 @@
                                 zmdError=zmdCmd.stderr.read()
                         except Exception as e:
-                                print(str(e))
+                                err=6
+                                self._debug((str(e))
+                        self._debug("Error: "+str(zmdError))
                         self._debug("Result: "+str(zmdResult))
-                        self._debug("Error: "+str(zmdError))
                         appInfo=self._get_Zmd_Info(appInfo)
                         if appInfo['status']=='Installed':
-                                self._set_status(6)
-                        else:
-                                self._set_status(0)
-                                self.result['data'].update({appInfo['name']:u'removed'})
+                                err=6
+                        self._set_status(err)
                         os.remove(zeroScript)
+                        return err
         #def _remove_Zmd
 
@@ -170 +171 @@
 
                 self._set_status(6)
-                self.result['data'].append(appInfo)
+#               self.result['data'].append(appInfo)
+#               self.result.append(appInfo)
                 return(appInfo)
         #def _get_Zmd_Info