Changeset 6038

Timestamp:

Oct 13, 2017, 2:28:32 PM (2 years ago)

Author:

jrpelegrina

Message:

WIP in showerror output in lliurex-upgrade

Location:

lliurex-up/trunk/fuentes

Files:

• lliurex-up-cli/usr/sbin/lliurex-upgrade (modified) (11 diffs)
• lliurex-up-indicator/usr/bin/lliurex-up-indicator (modified) (3 diffs)
• lliurex-up-indicator/usr/share/lliurex-up/rsrc/sp6.png (added)
• lliurex-up-indicator/usr/share/lliurex-up/rsrc/sp7.png (added)
• lliurex-up-indicator/usr/share/lliurex-up/rsrc/sp8.png (added)
• lliurex-up/usr/share/lliurex-up/lliurex-up.py (modified) (2 diffs)
• lliurex-up/usr/share/lliurex-up/terminal_config (added)

lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade

@@ -131 +131 @@
                         error=self.readErrorOutput(output[1])
                         if error:
+                                print("  [Lliurex-up]: Checking system. Error: " +'\n'+str(output[1]))
                                 log_msg="Exec Init-Actions. Error: %s"%output[1]
                         else:
@@ -137 +138 @@
                 except Exception as e:
                         log_msg="Exec Init-Actions.Error: " +str(e)
-                        print e
+                        print("  [Lliurex-up]: Checking system. Error: " +'\n'+str(e))
+
                         
                 self.log(log_msg)       
@@ -330 +332 @@
                         error=self.readErrorOutput(output[1])
                         if error:
+                                print("  [Lliurex-up]: Preparing system to update. Error: " +'\n'+str(output[1]))
                                 log_msg="Exec Pre-Actions. Error: %s"%output[1]
                         else:
@@ -335 +338 @@
 
                 except Exception as e:
+                        print("  [Lliurex-up]: Preparing system to update. Error: " +'\n'+str(e))
                         log_msg="Exec Pre-Actions. Error " +str(e)
-                        print e
+                        
 
                 self.log(log_msg)       
@@ -357 +361 @@
                         error=self.readErrorOutput(output[1])
                         if error:
+                                print("  [Lliurex-up]: Downloading and installing packages. Error: "+ '\n' +str(output[1]))
                                 log_msg="Exec Dist-upgrade. Error: %s"%output[1]
                         else:
@@ -362 +367 @@
                 
                 except Exception as e:
+                        print("  [Lliurex-up]: Downloading and installing packages. Error: " + '\n' +str(e))
                         log_msg="Exec Dist-uggrade.Error : " +str(e)
-                        print e
 
                 self.log(log_msg)       
@@ -386 +391 @@
                         error=self.readErrorOutput(output[1])
                         if error:
+                                print("  [Lliurex-up]: Ending the update. Error: " +'\n'+str(output[1]))
                                 self.errorpostaction=True
                                 log_msg="Exec Post-Actions. Error: %s"%output[1]
@@ -394 +400 @@
                 except Exception as e:
                         self.errorpostaction=True
+                        print("  [Lliurex-up]: Ending the update. Error: " +'\n'+str(e))
                         log_msg="Exec Post-Actions.Error:%s"%e
 
@@ -457 +464 @@
                                         if error:
                                                 self.errorfinalmetapackage=True
+                                                print ("  [Lliurex-up]: Install of metapackage. Error: " +'\n'+str(output[1]))
                                                 log_msg="Final install metapackage. Error %s"%output[1]
                                         else:
@@ -464 +472 @@
                                 except Exception as e:
                                         self.errorfinalmetapackage=True
+                                        print ("  [Lliurex-up]: Install of metapackage. Error: " +'\n'+str(e))
                                         log_msg="Install of metapackage. Error:%s"%e
 
@@ -474 +483 @@
                 except Exception as e:  
                         self.errorfinalmetapackage=True
+                        print ("  [Lliurex-up]: Checking Metapackage. Error:" +'\n'+str(e))
                         log_msg="Final check metapackage. Error:%s"%e   
                         self.log(log_msg)       

lliurex-up/trunk/fuentes/lliurex-up-indicator/usr/bin/lliurex-up-indicator

@@ -43 +43 @@
 SP4=RSRC+"rsrc/sp4.png"
 SP5=RSRC+"rsrc/sp5.png"
+SP6=RSRC+"rsrc/sp6.png"
+SP7=RSRC+"rsrc/sp7.png"
+SP8=RSRC+"rsrc/sp8.png"
 
 TARGET_FILE="/var/run/lliurexUp.lock"
@@ -337 +340 @@
         def spinner_sync(self):
         
-                if self.sp_cont>50:
+                if self.sp_cont>80:
                         self.sp_cont=0
                         
@@ -355 +358 @@
                         img=Gtk.Image.new_from_file(SP5)
                         self.sp_img=img 
+                elif self.sp_cont==50:
+                        img=Gtk.Image.new_from_file(SP6)
+                        self.sp_img=img         
+                elif self.sp_cont==60:
+                        img=Gtk.Image.new_from_file(SP7)
+                        self.sp_img=img         
+                elif self.sp_cont==70:
+                        img=Gtk.Image.new_from_file(SP8)
+                        self.sp_img=img         
                                 
         #def spinner_sync               

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

@@ -40 +40 @@
 DISABLE_INDICATOR_PATH="/etc/lliurex-up-indicator"
 DISABLE_INDICATOR_TOKEN=os.path.join(DISABLE_INDICATOR_PATH,'disableIndicator.token')
+TERMINAL_CONFIG=BASE_DIR+"terminal_config"
 
 
@@ -273 +274 @@
                         os.environ['HOME'],
                         #["/usr/sbin/dpkg-reconfigure", "xdm"],
-                        ["/bin/bash"],
+                        ["/bin/bash","--rcfile",TERMINAL_CONFIG],
                         [],
                         GLib.SpawnFlags.DO_NOT_REAP_CHILD,