Changeset 2590

Timestamp:

Oct 10, 2016, 4:01:39 PM (5 years ago)

Author:

hectorgh

Message:

wip

File:

• lliurex-mirror/trunk/fuentes/lliurex-mirror2/lliurex-mirror.py (modified) (2 diffs)

lliurex-mirror/trunk/fuentes/lliurex-mirror2/lliurex-mirror.py

@@ -1536 +1536 @@
                 
                 self.progress_label.set_text(str(self.percentage) + "%")
-                        
+                
+                
+                '''
+                
                 if self.percentage>=100:
                                         
@@ -1548 +1551 @@
                         self.export_label.set_text("Export")
 
+                '''
 
                 if ret["status"]:
                         return True
                 else:
-                                if not self.updating_mirror.info["cancelled"]:
-                                        ret=self.llx_conn.get_status(self.updating_mirror.info["KEY"])
-                                        if ret["status"]:
-                                                pass
-                                        else:
-                                                error="Error:\n"
+                        
+                        self.updating_mirror.info["executing"]=False
+                        self.updating_mirror.info["updating"]=False
+                        self.updating_mirror.info["exporting"]=False
+                        self.export_label_box.set_name("BUTTON_COLOR")
+                        self.update_label_box.set_name("BUTTON_COLOR")
                                                 
-                                                error+=ret["msg"].lstrip().rstrip()
-                                                self.set_info_text(error,Gtk.MessageType.ERROR)
+                        self.update_label.set_text("Update")
+                        self.export_label.set_text("Export")
+
+
+                        if not self.updating_mirror.info["cancelled"]:
+                                ret=self.llx_conn.get_status(self.updating_mirror.info["KEY"])
+                                if ret["status"]:
+                                        pass
+                                else:
+                                        error="Error:\n"
                                                 
-                                                self.updating_mirror.info["executing"]=False
-                                                self.updating_mirror.info["updating"]=False
-                                                self.updating_mirror.info["exporting"]=False
-                                                self.updating_mirror.info["cancelled"]=True
-                                                self.export_label_box.set_name("BUTTON_COLOR")
-                                                self.update_label_box.set_name("BUTTON_COLOR")
-                                                self.update_label.set_text("Update")
-                                                self.export_label.set_text("Export")
-                        
+                                        error+=ret["msg"].lstrip().rstrip()
+                                        self.set_info_text(error,Gtk.MessageType.ERROR)
+                                                
+                                        self.updating_mirror.info["executing"]=False
+                                        self.updating_mirror.info["updating"]=False
+                                        self.updating_mirror.info["exporting"]=False
+                                        self.updating_mirror.info["cancelled"]=True
+                                        self.export_label_box.set_name("BUTTON_COLOR")
+                                        self.update_label_box.set_name("BUTTON_COLOR")
+                                        self.update_label.set_text("Update")
+                                        self.export_label.set_text("Export")
+
                 
         #def update_percentage