Changeset 3389

Timestamp:

Jan 20, 2017, 1:14:59 PM (4 years ago)

Author:

jrpelegrina

Message:

Fix code

Location:

lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up

Files:

• LliurexUpConnect.py (modified) (4 diffs)
• lliurex-up.py (modified) (7 diffs)

lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/LliurexUpConnect.py

@@ -252 +252 @@
                         
                         self.lliurexVersionLocal=self.llxUpCore.getLliurexVersionLocal()
-                        log_msg="Get LliurexVersion installed: " + self.lliurexVersionLocal["installed"]
-                        self.log(log_msg)
-                        log_msg="Get LliurexVersion candidate from Local repository: " + self.lliurexVersionLocal["candidate"]
+                        log_msg="Get LliurexVersion installed: " + str(self.lliurexVersionLocal["installed"])
+                        self.log(log_msg)
+                        log_msg="Get LliurexVersion candidate from Local repository: " + str(self.lliurexVersionLocal["candidate"])
                         self.log(log_msg)
                         #self.lliurexVersionLocal=self.lliurexVersionLocal["candidate"]
@@ -261 +261 @@
                         log_msg="Get LliurexVersion from Local repository. Error: " + str(e)
                         self.log(log_msg)
-                        self.lliurexVersionLocal=None
+                        self.lliurexVersionLocal={"installed":None,"candidate":None}
 
                 return self.lliurexVersionLocal
@@ -271 +271 @@
                 try:
                         self.lliurexVersionNet=self.llxUpCore.getLliurexVersionLliurexNet()["candidate"]
-                        log_msg="Get LliurexVersion candidate from Lliurex Net: " + self.lliurexVersionNet
+                        log_msg="Get LliurexVersion candidate from Lliurex Net: " + str(self.lliurexVersionNet)
                         self.log(log_msg)
                         
@@ -436 +436 @@
         #def checkErrorDistUpgrade
         
+        def getStatusPackage(self,package,version):
+
+                command='dpkg -l ' + package + ' |grep "^i[i]"'
+                try:
+                        p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE)
+                        line=p.stdout.readline().split()
+                        if len(line)>0:
+                                if version == line[2]:
+                                        return True
+                                else:
+                                        return False
+                        else:
+                                return False
+                except Exception as e:
+                        return False                                    
+  
         def checkFinalFlavour(self):
                 

lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py

@@ -32 +32 @@
 GLADE_FILE=BASE_DIR+"rsrc/lliurex-up.ui"
 CACHED_ICON=BASE_DIR+"rsrc/cached.png"
-DONE_ICON=BASE_DIR+"/done.png"
+DONE_ICON=BASE_DIR+"/rsrc/done.png"
 ERROR_ICON=BASE_DIR+"rsrc/error.png"
 
@@ -934 +934 @@
 
                 #self.version_available=self.llxup_connect.getLliurexVersionNet()
-                msg_current_version_info="<span foreground='#3366cc'><b>"+ self.version_update["installed"]+"</b></span>"
+                msg_current_version_info="<span foreground='#3366cc'><b>"+ str(self.version_update["installed"])+"</b></span>"
 
                 if self.version_available==None:
@@ -948 +948 @@
 
 
-                if self.version_update==None:
+                if self.version_update["candidate"]==None:
                         msg_version_update_info="<span foreground='#3366cc'><b>"+_("Info not available")+"</b></span>"
                 
@@ -1042 +1042 @@
 
                 if not self.preactions_process_t.launched:
-                        self.cancel_button_box.hide()
                         self.number_process=4
                         self.pbar.show()
@@ -1069 +1068 @@
                         print "[Lliurex-up]: Executing pre-actions"
                         self.pbar_label.show()
+                        self.cancel_button_box.hide()
 
                         self.preactions_process_t.start()
@@ -1107 +1107 @@
                                                         self.pbar_label.hide()
                                                         self.terminal_label.set_name("CHANGELOG_FONT")
+                                                        #self.update_installed_icon()
                                                         if not self.llxup_connect.checkErrorDistUpgrade():
                                                                 self.msg_upgrade_running="<span><b>" + _("The system is now update") + "</b></span>"
@@ -1227 +1228 @@
         def update_installed_icon(self):
         
-                image=Gtk.Image()
-                image.set_from_file(DONE_ICON)          
-                icon=image.get_pixbuf()
-
-                # for item in self.packages_store:
-                #       name=item[0].split(">")[2]
-                #       name=name.split("<")[0]
-                #       version=item[1].split(">")[2]
-                #       version=version.split("<")[0]
-                #       status=self.llxup_connect.getStatusPackage(name,version)
-                #       if name==pkg_name:
-                #               item[3]=icon
-                
+                imagok=Gtk.Image()
+                imagok.set_from_file(DONE_ICON)         
+                iconk=imagok.get_pixbuf()
+
+                imagerr=Gtk.Image()
+                imagerr.set_from_file(ERROR_ICON)               
+                iconerr=imagerr.get_pixbuf()
+
+                for item in self.packages_store:
+                        name=item[0].split(">")[2]
+                        name=name.split("<")[0]
+                        version=item[0].split(">")[5]
+                        version=version.split("<")[0]
+                        status=self.llxup_connect.getStatusPackage(name,version)
+                        if status:
+                                item[1]=iconok
+                        else:
+                                item[1]=iconerr
                         
         #def update_installed_icon