Changeset 3389
- Timestamp:
- Jan 20, 2017, 1:14:59 PM (4 years ago)
- Location:
- lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/LliurexUpConnect.py
r3258 r3389 252 252 253 253 self.lliurexVersionLocal=self.llxUpCore.getLliurexVersionLocal() 254 log_msg="Get LliurexVersion installed: " + s elf.lliurexVersionLocal["installed"]255 self.log(log_msg) 256 log_msg="Get LliurexVersion candidate from Local repository: " + s elf.lliurexVersionLocal["candidate"]254 log_msg="Get LliurexVersion installed: " + str(self.lliurexVersionLocal["installed"]) 255 self.log(log_msg) 256 log_msg="Get LliurexVersion candidate from Local repository: " + str(self.lliurexVersionLocal["candidate"]) 257 257 self.log(log_msg) 258 258 #self.lliurexVersionLocal=self.lliurexVersionLocal["candidate"] … … 261 261 log_msg="Get LliurexVersion from Local repository. Error: " + str(e) 262 262 self.log(log_msg) 263 self.lliurexVersionLocal= None263 self.lliurexVersionLocal={"installed":None,"candidate":None} 264 264 265 265 return self.lliurexVersionLocal … … 271 271 try: 272 272 self.lliurexVersionNet=self.llxUpCore.getLliurexVersionLliurexNet()["candidate"] 273 log_msg="Get LliurexVersion candidate from Lliurex Net: " + s elf.lliurexVersionNet273 log_msg="Get LliurexVersion candidate from Lliurex Net: " + str(self.lliurexVersionNet) 274 274 self.log(log_msg) 275 275 … … 436 436 #def checkErrorDistUpgrade 437 437 438 def getStatusPackage(self,package,version): 439 440 command='dpkg -l ' + package + ' |grep "^i[i]"' 441 try: 442 p = subprocess.Popen(command,shell=True,stdout=subprocess.PIPE) 443 line=p.stdout.readline().split() 444 if len(line)>0: 445 if version == line[2]: 446 return True 447 else: 448 return False 449 else: 450 return False 451 except Exception as e: 452 return False 453 438 454 def checkFinalFlavour(self): 439 455 -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py
r3351 r3389 32 32 GLADE_FILE=BASE_DIR+"rsrc/lliurex-up.ui" 33 33 CACHED_ICON=BASE_DIR+"rsrc/cached.png" 34 DONE_ICON=BASE_DIR+"/ done.png"34 DONE_ICON=BASE_DIR+"/rsrc/done.png" 35 35 ERROR_ICON=BASE_DIR+"rsrc/error.png" 36 36 … … 934 934 935 935 #self.version_available=self.llxup_connect.getLliurexVersionNet() 936 msg_current_version_info="<span foreground='#3366cc'><b>"+ s elf.version_update["installed"]+"</b></span>"936 msg_current_version_info="<span foreground='#3366cc'><b>"+ str(self.version_update["installed"])+"</b></span>" 937 937 938 938 if self.version_available==None: … … 948 948 949 949 950 if self.version_update ==None:950 if self.version_update["candidate"]==None: 951 951 msg_version_update_info="<span foreground='#3366cc'><b>"+_("Info not available")+"</b></span>" 952 952 … … 1042 1042 1043 1043 if not self.preactions_process_t.launched: 1044 self.cancel_button_box.hide()1045 1044 self.number_process=4 1046 1045 self.pbar.show() … … 1069 1068 print "[Lliurex-up]: Executing pre-actions" 1070 1069 self.pbar_label.show() 1070 self.cancel_button_box.hide() 1071 1071 1072 1072 self.preactions_process_t.start() … … 1107 1107 self.pbar_label.hide() 1108 1108 self.terminal_label.set_name("CHANGELOG_FONT") 1109 #self.update_installed_icon() 1109 1110 if not self.llxup_connect.checkErrorDistUpgrade(): 1110 1111 self.msg_upgrade_running="<span><b>" + _("The system is now update") + "</b></span>" … … 1227 1228 def update_installed_icon(self): 1228 1229 1229 image=Gtk.Image() 1230 image.set_from_file(DONE_ICON) 1231 icon=image.get_pixbuf() 1232 1233 # for item in self.packages_store: 1234 # name=item[0].split(">")[2] 1235 # name=name.split("<")[0] 1236 # version=item[1].split(">")[2] 1237 # version=version.split("<")[0] 1238 # status=self.llxup_connect.getStatusPackage(name,version) 1239 # if name==pkg_name: 1240 # item[3]=icon 1241 1230 imagok=Gtk.Image() 1231 imagok.set_from_file(DONE_ICON) 1232 iconk=imagok.get_pixbuf() 1233 1234 imagerr=Gtk.Image() 1235 imagerr.set_from_file(ERROR_ICON) 1236 iconerr=imagerr.get_pixbuf() 1237 1238 for item in self.packages_store: 1239 name=item[0].split(">")[2] 1240 name=name.split("<")[0] 1241 version=item[0].split(">")[5] 1242 version=version.split("<")[0] 1243 status=self.llxup_connect.getStatusPackage(name,version) 1244 if status: 1245 item[1]=iconok 1246 else: 1247 item[1]=iconerr 1242 1248 1243 1249 #def update_installed_icon
Note: See TracChangeset
for help on using the changeset viewer.