Changeset 3035
- Timestamp:
- Dec 12, 2016, 2:05:08 PM (4 years ago)
- Location:
- lliurex-up/trunk/fuentes/lliurex-up-gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-up/trunk/fuentes/lliurex-up-gui/LliurexUpConnect.py
r3016 r3035 30 30 31 31 def checkInitialFlavour(self): 32 32 33 self.targetMetapackage=None 34 33 35 try: 34 36 self.targetMetapackage=self.llxUpCore.checkFlavour() … … 36 38 self.log(log_msg) 37 39 self.previousFlavours=self.llxUpCore.previuosFlavours 40 41 if len(self.previousFlavours)==0: 42 self.llxUpCore.getPreviuosFlavours() 43 38 44 log_msg="Get initial flavours: " + str(self.previousFlavours) 39 45 self.log(log_msg) 40 self.flavours=self.llxUpCore.flavours 41 log_msg="Get update flavours " + str(self.flavours) 42 self.log(log_msg) 43 46 44 47 except Exception as e: 45 48 log_msg="Initial check metapackage. Error: " + str(e) … … 51 54 52 55 def requiresInstallFlavour(self): 53 56 54 57 flavourToInstall=None 55 if self.targetMetapackage !=None: 56 flavourToInstall=self.targetMetapackage 57 log_msg="Requires Install this flavour: " + str(flavourToInstall) 58 self.log(log_msg) 59 else: 60 if self.previousFlavours==self.flavours: 61 log_msg="Requires Install Flavour: No" 62 self.log(log_msg) 63 else: 58 59 self.flavours=self.llxUpCore.flavours 60 log_msg="Get update flavours " + str(self.flavours) 61 self.log(log_msg) 62 63 if not 'None' in self.previousFlavours: 64 if self.previousFlavours !=self.flavours: 64 65 log_msg="Requires Install Flavour: Yes" 65 66 self.log(log_msg) 67 68 else: 69 log_msg="Requires Install Flavour: No" 70 self.log(log_msg) 71 66 72 67 73 return flavourToInstall … … 171 177 172 178 try: 173 self.lliurexVersionLocal=self.llxUpCore.getLliurexVersionLocal()["candidate"] 174 log_msg="Get LliurexVersion from Local repository: " + self.lliurexVersionLocal 175 self.log(log_msg) 176 179 180 self.lliurexVersionLocal=self.llxUpCore.getLliurexVersionLocal() 181 log_msg="Get LliurexVersion installed: " + self.lliurexVersionLocal["installed"] 182 self.log(log_msg) 183 log_msg="Get LliurexVersion candidate from Local repository: " + self.lliurexVersionLocal["candidate"] 184 self.log(log_msg) 185 self.lliurexVersionLocal=self.lliurexVersionLocal["candidate"] 177 186 178 187 except Exception as e: … … 187 196 try: 188 197 self.lliurexVersionNet=self.llxUpCore.getLliurexVersionLliurexNet()["candidate"] 189 log_msg="Get LliurexVersion from Lliurex Net: " + self.lliurexVersionNet198 log_msg="Get LliurexVersion candidate from Lliurex Net: " + self.lliurexVersionNet 190 199 self.log(log_msg) 191 200 … … 220 229 221 230 def checkFinalFlavour(self): 222 self.targetMetapackage=None 223 231 232 flavourToInstall=None 233 224 234 try: 225 235 self.targetMetapackage=self.llxUpCore.checkFlavour() 226 log_msg="Final check metapackage. Metapackage to install: " + str(targetMetapackage) 227 self.log(log_msg) 236 log_msg="Final check metapackage. Metapackage to install: " + str(self.targetMetapackage) 237 self.log(log_msg) 238 239 if self.targetMetapackage == None: 240 flavourToInstall=self.requiresInstallFlavour() 241 else: 242 flavourToInstall=self.targetMetapackage 243 244 228 245 except Exception as e: 229 246 log_msg="Final check metapackage. Error: " + str(e) 230 247 self.log(log_msg) 231 248 232 return self.targetMetapackage249 return flavourToInstall 233 250 234 251 #def getPackagesToUpdate -
lliurex-up/trunk/fuentes/lliurex-up-gui/LliurexUpCore.py
r3016 r3035 13 13 self.defaultVersion = 'xenial' 14 14 self.processPath = '/var/run/lliurex-up' 15 self.changelogsPath = '/var/run/lliurex-up/changelogs'16 self.processSourceslist = '/var/run/lliurex-up/sourceslist'15 self.changelogsPath = os.path.join(self.processPath,'changelogs') 16 self.processSourceslist = os.path.join(self.processPath,'sourceslist') 17 17 self.previousflavourspath = os.path.join(self.processPath,'previousflavours') 18 18 … … 38 38 aux.close() 39 39 40 40 41 def updateFlavoursList(self): 41 42 self.flavours = [ x.strip() for x in self.n4d.lliurex_version('','LliurexVersion','-v')[1].split(',') ] … … 57 58 This funcion delete all environment and rebuild environment 58 59 ''' 60 if not os.path.exists(self.processPath): 61 os.mkdir(self.processPath) 62 if not os.path.exists(self.processSourceslist): 63 os.mkdir(self.processSourceslist) 64 if not os.path.exists(self.changelogsPath): 65 os.mkdir(self.changelogsPath) 66 self.writeDefaultSourceslist() 67 68 def cleanEnvironment(self): 59 69 if os.path.exists(self.processPath): 60 70 shutil.rmtree(os.path.join(self.processPath)) 61 os.mkdir(self.processPath)62 os.mkdir(self.processSourceslist)63 os.mkdir(self.changelogsPath)64 self.writeDefaultSourceslist()65 71 66 72 … … 121 127 This function install lliurex-up 122 128 ''' 123 command = "LANG=C apt-get install lliurex-up{options}".format(options=options)129 command = "LANG=C apt-get install testdisk {options}".format(options=options) 124 130 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE) 125 131 poutput,perror = p.communicate() -
lliurex-up/trunk/fuentes/lliurex-up-gui/lliurex-up.py
r3016 r3035 286 286 self.set_css_info() 287 287 288 msg_gather="<span><b>"+_("Checking for new version of lliurex-up")+"</b></span>"288 msg_gather="<span><b>"+_("Checking for new version of Lliurex-up")+"</b></span>" 289 289 self.gather_label.set_markup(msg_gather) 290 290 GLib.timeout_add(100,self.pulsate_checksystem) … … 337 337 self.gather_packages_t.launched=False 338 338 self.update_process_t.launched=False 339 #self.spinner.start()339 self.spinner.start() 340 340 341 341 self.package_list=[] 342 342 self.max_seconds=5.0 343 343 self.current_second=0 344 self.gather_process=9 344 345 345 346 GObject.threads_init() … … 494 495 def pulsate_checksystem(self): 495 496 496 self.pbar.pulse()497 #self.pbar.pulse() 497 498 498 499 if not self.check_lliurexup_t.launched: 499 print "[Lliurex-up]: Checking lliurexup version"500 print "[Lliurex-up]: Checking Lliurex-up version" 500 501 self.check_lliurexup_t.start() 501 502 self.check_lliurexup_t.launched=True 503 self.show_number_process_executing(1) 502 504 503 505 if self.check_lliurexup_t.done: 504 506 if not self.is_lliurexup_updated: 505 507 if not self.install_lliurexup_t.is_alive() and not self.install_lliurexup_t.launched: 506 print "[Lliurex-up]: Updating lliurex-up"507 msg_gather="<span><b>"+_("Updating lliurex-up")+"</b></span>"508 print "[Lliurex-up]: Updating Lliurex-up" 509 msg_gather="<span><b>"+_("Updating Lliurex-up")+"</b></span>" 508 510 self.gather_label.set_markup(msg_gather) 509 511 self.install_lliurexup_t.start() 510 512 self.install_lliurexup_t.launched=True 513 self.show_number_process_executing(2) 514 511 515 else: 512 516 if self.install_lliurexup_t.done: 513 print "[Lliurex-up]: Reboot lliurex-up"517 print "[Lliurex-up]: Reboot Lliurex-up" 514 518 #msg_gather="<span><b>"+_("Lliurex-up is now updated and will be reboot")+"</b></span>" 515 519 #self.pbar.hide() 516 520 #self.gather_label.set_markup(msg_gather) 517 521 #self.t=threading.Thread(target=self.reboot_lliurexup) 518 #self.pbar.hide()522 self.pbar_label.hide() 519 523 self.msg_wait="<span><b>"+_("Lliurex-up is now updated and will be reboot in %s seconds...")+"</b></span>" 520 524 GLib.timeout_add(10,self.wait_to_reboot) … … 530 534 self.check_mirror_t.start() 531 535 self.check_mirror_t.launched=True 536 self.show_number_process_executing(3) 537 532 538 533 539 … … 541 547 self.no_button_box.show() 542 548 self.pbar.hide() 543 self.spinner.stop() 549 self.pbar_label.hide() 550 #self.spinner.stop() 544 551 msg_gather="<span><b>"+_("Your mirror is not update.Do you want to update it?")+"</b></span>" 545 552 self.gather_label.set_markup(msg_gather) … … 624 631 625 632 #self.response=0 626 self.pbar.show() 633 self.pbar.show() 634 self.pbar_label.show() 627 635 GLib.timeout_add(100,self.pulsate_get_info) 628 636 self.yes_button_box.hide() … … 693 701 694 702 else: 695 self.spinner.stop()696 self.pbar_label.hide()703 #self.spinner.stop() 704 #self.pbar_label.hide() 697 705 GLib.timeout_add(100,self.pulsate_get_info) 698 706 return False … … 718 726 def pulsate_get_info(self): 719 727 720 self.pbar.pulse()728 #self.pbar.pulse() 721 729 722 730 if not self.get_lliurexversionlocal_t.launched: 723 print "[Lliurex-up]: GetLliurexVersion from local repository "724 msg_gather="<span><b>"+_(" Get LliurexVersion from local repository")+"</b></span>"731 print "[Lliurex-up]: Checking LliurexVersion from local repository " 732 msg_gather="<span><b>"+_("Checking version to update")+"</b></span>" 725 733 self.gather_label.set_markup(msg_gather) 726 734 self.get_lliurexversionlocal_t.start() 727 735 self.get_lliurexversionlocal_t.launched=True 736 self.show_number_process_executing(4) 737 728 738 729 739 730 740 if self.get_lliurexversionlocal_t.done: 731 741 if not self.get_lliurexversionnet_t.is_alive() and not self.get_lliurexversionnet_t.launched: 732 print "[Lliurex-up]: GetLliurexVersion from Lliurex net"733 msg_gather="<span><b>"+_(" Get LliurexVersion from lliurex net")+"</b></span>"742 print "[Lliurex-up]: Checking LliurexVersion from Lliurex net" 743 msg_gather="<span><b>"+_("Checking version available")+"</b></span>" 734 744 self.gather_label.set_markup(msg_gather) 735 745 self.get_lliurexversionnet_t.start() 736 746 self.get_lliurexversionnet_t.launched=True 747 self.show_number_process_executing(5) 748 737 749 738 750 … … 745 757 self.checkFlavourToInstall_t.start() 746 758 self.checkFlavourToInstall_t.launched=True 759 self.show_number_process_executing(6) 760 747 761 748 762 … … 755 769 self.gather_packages_t.start() 756 770 self.gather_packages_t.launched=True 771 self.show_number_process_executing(7) 757 772 758 773 759 774 if self.gather_packages_t.done: 775 self.spinner.stop() 776 self.pbar.hide() 777 self.pbar_label.hide() 778 self.cancel_button_box.show() 779 780 760 781 if len(self.packages)==0: 761 782 msg_gather="<span><b>"+_("Your system is update")+"</b></span>" 762 783 self.gather_label.set_markup(msg_gather) 763 784 self.pbar.hide() 764 self.cancel_button_box.show()765 785 print "[Lliurex-up]: Sytem update. Nothing to do" 766 786 return False … … 772 792 self.populate_packages_tv() 773 793 self.get_update_summary() 774 self.pbar.hide()775 self.pbar_label.hide()776 self.spinner.stop()777 794 self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT) 778 795 self.stack.set_visible_child_name("update") 779 self.cancel_button_box.show()780 796 return False 781 797 … … 814 830 def checkFlavourToInstall(self): 815 831 816 self.flavourToInstall=self.llxup_connect. requiresInstallFlavour()817 818 if self.flavourToInstall != None:819 print "[Lliurex-up]: Installation of flavour is required"820 821 822 else:823 print "[Lliurex-up]: Installation of flavour is not required"824 832 self.flavourToInstall=self.llxup_connect.targetMetapackage 833 834 if self.flavourToInstall == None: 835 self.flavourToInstall=self.llxup_connect.requiresInstallFlavour() 836 if self.flavourToInstall != None: 837 print "[Lliurex-up]: Installation of flavour is required" 838 else: 839 print "[Lliurex-up]: Installation of flavour is not required" 840 825 841 self.checkFlavourToInstall_t.done=True 826 842 … … 838 854 839 855 #self.version_available=self.llxup_connect.getLliurexVersionNet() 840 841 if 'client' in self.llxup_connect.previousFlavours or self.flavourToInstall=='client': 842 msg_version_available_info="<span foreground='#3366cc'><b>"+_("Info not available for clients")+"</b></span>" 856 if self.version_available==None: 857 if 'client' in self.llxup_connect.previousFlavours or self.flavourToInstall=='client': 858 msg_version_available_info="<span foreground='#3366cc'><b>"+_("Info not available for clients")+"</b></span>" 859 860 else: 861 msg_version_available_info="<span foreground='#CC0000'><b>"+_("Info not available. Check conexion to lliurex.net")+"</b></span>" 843 862 844 863 else: 845 if self.version_available==None: 846 msg_version_available_info="<span foreground='#CC0000'><b>"+_("Info not available. Check conexion to lliurex.net")+"</b></span>" 847 848 else: 849 #self.version_available="16.160920" 850 msg_version_available_info="<span foreground='#3366cc'><b>"+self.version_available+"</b></span>" 864 #self.version_available="16.160920" 865 msg_version_available_info="<span foreground='#3366cc'><b>"+self.version_available+"</b></span>" 851 866 852 867 … … 858 873 859 874 self.number_pkg=len(self.packages) 860 self.size_update="100 Mb" 875 self.size_update_label.hide() 876 #self.size_update="100 Mb" 861 877 862 878 863 879 msg_number="<span foreground='#3366cc'><b>"+str(self.number_pkg)+"</b></span>" 864 msg_size="<span foreground='#3366cc'><b>"+self.size_update+"</b></span>"880 #msg_size="<span foreground='#3366cc'><b>"+self.size_update+"</b></span>" 865 881 866 882 self.version_available_label_info.set_markup(msg_version_available_info) 867 883 self.version_update_label_info.set_markup(msg_version_update) 868 884 self.number_packages_label_info.set_markup(msg_number) 869 self.size_update_label_info.set_markup(msg_size)885 #self.size_update_label_info.set_markup(msg_size) 870 886 871 887 #def get_update_summary … … 885 901 #def updated_percentage 886 902 903 def show_number_process_executing(self, execprocess): 904 905 self.pbar.set_fraction(execprocess/8.0) 906 msg_pbar="Executing process: " + str(execprocess) + " of 7" 907 msg_pbar="<span><b>"+msg_pbar+"</b></span>" 908 self.pbar_label.set_markup(msg_pbar) 909 910 887 911 def populate_packages_tv(self): 888 912 … … 967 991 msg_updgrade_running="<span><b>" + _("The system is now update") + "</b></span>" 968 992 self.terminal_label.set_markup(msg_updgrade_running) 993 self.checkFinalFlavour() 969 994 self.update_process_t.done=True 970 995 return False
Note: See TracChangeset
for help on using the changeset viewer.