Changeset 6038
- Timestamp:
- Oct 13, 2017, 2:28:32 PM (3 years ago)
- Location:
- lliurex-up/trunk/fuentes
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade
r5992 r6038 131 131 error=self.readErrorOutput(output[1]) 132 132 if error: 133 print(" [Lliurex-up]: Checking system. Error: " +'\n'+str(output[1])) 133 134 log_msg="Exec Init-Actions. Error: %s"%output[1] 134 135 else: … … 137 138 except Exception as e: 138 139 log_msg="Exec Init-Actions.Error: " +str(e) 139 print e 140 print(" [Lliurex-up]: Checking system. Error: " +'\n'+str(e)) 141 140 142 141 143 self.log(log_msg) … … 330 332 error=self.readErrorOutput(output[1]) 331 333 if error: 334 print(" [Lliurex-up]: Preparing system to update. Error: " +'\n'+str(output[1])) 332 335 log_msg="Exec Pre-Actions. Error: %s"%output[1] 333 336 else: … … 335 338 336 339 except Exception as e: 340 print(" [Lliurex-up]: Preparing system to update. Error: " +'\n'+str(e)) 337 341 log_msg="Exec Pre-Actions. Error " +str(e) 338 print e342 339 343 340 344 self.log(log_msg) … … 357 361 error=self.readErrorOutput(output[1]) 358 362 if error: 363 print(" [Lliurex-up]: Downloading and installing packages. Error: "+ '\n' +str(output[1])) 359 364 log_msg="Exec Dist-upgrade. Error: %s"%output[1] 360 365 else: … … 362 367 363 368 except Exception as e: 369 print(" [Lliurex-up]: Downloading and installing packages. Error: " + '\n' +str(e)) 364 370 log_msg="Exec Dist-uggrade.Error : " +str(e) 365 print e366 371 367 372 self.log(log_msg) … … 386 391 error=self.readErrorOutput(output[1]) 387 392 if error: 393 print(" [Lliurex-up]: Ending the update. Error: " +'\n'+str(output[1])) 388 394 self.errorpostaction=True 389 395 log_msg="Exec Post-Actions. Error: %s"%output[1] … … 394 400 except Exception as e: 395 401 self.errorpostaction=True 402 print(" [Lliurex-up]: Ending the update. Error: " +'\n'+str(e)) 396 403 log_msg="Exec Post-Actions.Error:%s"%e 397 404 … … 457 464 if error: 458 465 self.errorfinalmetapackage=True 466 print (" [Lliurex-up]: Install of metapackage. Error: " +'\n'+str(output[1])) 459 467 log_msg="Final install metapackage. Error %s"%output[1] 460 468 else: … … 464 472 except Exception as e: 465 473 self.errorfinalmetapackage=True 474 print (" [Lliurex-up]: Install of metapackage. Error: " +'\n'+str(e)) 466 475 log_msg="Install of metapackage. Error:%s"%e 467 476 … … 474 483 except Exception as e: 475 484 self.errorfinalmetapackage=True 485 print (" [Lliurex-up]: Checking Metapackage. Error:" +'\n'+str(e)) 476 486 log_msg="Final check metapackage. Error:%s"%e 477 487 self.log(log_msg) -
lliurex-up/trunk/fuentes/lliurex-up-indicator/usr/bin/lliurex-up-indicator
r5651 r6038 43 43 SP4=RSRC+"rsrc/sp4.png" 44 44 SP5=RSRC+"rsrc/sp5.png" 45 SP6=RSRC+"rsrc/sp6.png" 46 SP7=RSRC+"rsrc/sp7.png" 47 SP8=RSRC+"rsrc/sp8.png" 45 48 46 49 TARGET_FILE="/var/run/lliurexUp.lock" … … 337 340 def spinner_sync(self): 338 341 339 if self.sp_cont> 50:342 if self.sp_cont>80: 340 343 self.sp_cont=0 341 344 … … 355 358 img=Gtk.Image.new_from_file(SP5) 356 359 self.sp_img=img 360 elif self.sp_cont==50: 361 img=Gtk.Image.new_from_file(SP6) 362 self.sp_img=img 363 elif self.sp_cont==60: 364 img=Gtk.Image.new_from_file(SP7) 365 self.sp_img=img 366 elif self.sp_cont==70: 367 img=Gtk.Image.new_from_file(SP8) 368 self.sp_img=img 357 369 358 370 #def spinner_sync -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py
r5992 r6038 40 40 DISABLE_INDICATOR_PATH="/etc/lliurex-up-indicator" 41 41 DISABLE_INDICATOR_TOKEN=os.path.join(DISABLE_INDICATOR_PATH,'disableIndicator.token') 42 TERMINAL_CONFIG=BASE_DIR+"terminal_config" 42 43 43 44 … … 273 274 os.environ['HOME'], 274 275 #["/usr/sbin/dpkg-reconfigure", "xdm"], 275 ["/bin/bash" ],276 ["/bin/bash","--rcfile",TERMINAL_CONFIG], 276 277 [], 277 278 GLib.SpawnFlags.DO_NOT_REAP_CHILD,
Note: See TracChangeset
for help on using the changeset viewer.