Changeset 3493
- Timestamp:
- Feb 1, 2017, 2:49:56 PM (4 years ago)
- Location:
- lliurex-up/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-up/trunk/fuentes/lliurex-up-cli/usr/sbin/lliurex-upgrade
r3449 r3493 7 7 import sys 8 8 import commands 9 import time9 import datetime 10 10 11 11 class LliurexUpCli(object): … … 13 13 14 14 self.lliurexcore = lliurex.lliurexup.LliurexUpCore() 15 log_msg="------------------------------------------\n"+"LLIUREX-UP-CLI STARTING AT: " + datetime.datetime.today().strftime("%d/%m/%y %H:%M:%S") +"\n------------------------------------------" 16 self.log(log_msg) 15 17 self.checkInitialFlavour() 16 18 … … 18 20 19 21 self.targetMetapackage=self.lliurexcore.checkInitialFlavour() 20 21 # try: 22 # self.targetMetapackage=self.lliurexcore.checkFlavour() 23 24 # #if self.targetMetapackage !=None: 25 # self.metapackageRef=self.lliurexcore.metapackageRef 26 # if len(self.metapackageRef)==0: 27 # self.lliurexcore.getTargetMetapackage() 28 # self.metapackageRef=sorted(self.metapackageRef) 29 30 # self.previousFlavours=self.lliurexcore.previuosFlavours 31 # if len(self.previousFlavours)==0: 32 # self.lliurexcore.getPreviuosFlavours() 33 # except Exception as e: 34 # print e 22 log_msg="Initial check metapackage. Metapackage to install: " + str(self.targetMetapackage) 23 self.log(log_msg) 24 log_msg="Get initial flavours: " + str(self.lliurexcore.previuosFlavours) 25 self.log(log_msg) 26 35 27 36 28 def initActionsScript(self): 37 29 38 30 command=self.lliurexcore.initActionsScript(self.initActionsArg) 31 39 32 try: 40 33 os.system(command) 41 34 log_msg="Exec Init-Actions" 35 self.log(log_msg) 42 36 except Exception as e: 37 log_msg="Exec Init-Actions.Error: " +str(e) 38 self.log(log_msg) 43 39 print e 44 40 … … 46 42 47 43 is_lliurexup_updated=self.lliurexcore.isLliurexUpIsUpdated() 44 48 45 49 46 if not is_lliurexup_updated: 50 47 print (" [Lliurex-up]: Updating Lliurex-up") 51 48 is_lliurexup_installed=self.lliurexcore.installLliurexUp() 49 log_msg="Installing lliurex-up. Returncode: " + str(is_lliurexup_installed['returncode']) + ". Error: " + str(is_lliurexup_installed['stderrs']) 50 self.log(log_msg) 52 51 print (" [Lliurex-up]: Lliurex-up is now udpate and will be reboot now" ) 53 52 time.sleep(3) … … 55 54 56 55 else: 56 log_msg="Checking lliurex-up. Is lliurex-up updated: "+ str(is_lliurexup_updated) 57 self.log(log_msg) 57 58 print (" [Lliurex-up]: Lliurex-up is updated.Nothing to do") 58 59 … … 66 67 67 68 if is_mirror_updated['action']=='update': 69 log_msg="Checking mirror. Is mirror update: False" 70 self.log(log_msg) 68 71 if not is_mirror_running: 69 72 response=raw_input(' [LLiurex-up]: Do you want update mirror (yes/no): ').lower() 70 73 if response.startswith('y'): 74 log_msg="Update lliurex-mirror: Yes" 75 self.log(log_msg) 71 76 print(" [Lliurex-up]: Updating mirror. Wait a moment please") 72 77 command='lliurex-mirror update llx16' 73 78 os.system(command) 74 79 else: 80 log_msg="Update lliurex-mirror: No" 81 self.log(log_msg) 75 82 print(" [Lliurex-up]: Mirror update.Nothing to do") 76 83 else: 84 log_msg="Checking mirror. Is mirror update: None" 85 self.log(log_msg) 77 86 print(" [Lliurex-up]: Nothing to do with mirror") 78 87 … … 82 91 83 92 if self.targetMetapackage == None: 84 self.flavourToInstall=self.lliurexcore.requiresInstallFlavour() 85 if self.flavourToInstall != None: 86 print " [Lliurex-up]: Installation of flavour is required: " +str(self.flavourToInstall) 87 is_flavour_installed=self.lliurexcore.installInitialFlavour(self.flavourToInstall) 88 returncode=is_flavour_installed['returncode'] 89 error=is_flavour_installed['stderrs'] 90 print " [Lliurex-up]: Flavour is now installed: " + str(returncode) + " Error: " + str(error) 93 # self.flavourToInstall=self.lliurexcore.requiresInstallFlavour() 94 # if self.flavourToInstall != None: 95 # log_msg="Requires Install this Flavour: " + str(self.flavourToInstall) 96 # self.log(log_msg) 97 # print " [Lliurex-up]: Installation of flavour is required: " +str(self.flavourToInstall) 98 # is_flavour_installed=self.lliurexcore.installInitialFlavour(self.flavourToInstall) 99 # returncode=is_flavour_installed['returncode'] 100 # error=is_flavour_installed['stderrs'] 101 # print " [Lliurex-up]: Flavour is now installed: " + str(returncode) + " Error: " + str(error) 102 # log_msg="Install initial flavour:" + flavourToInstall + ": Returncode: " + str(returncode) + " Error: " + str(error) 103 # self.log(log_msg) 104 # else: 105 print " [Lliurex-up]: Installation of metapackage is not required" 106 107 else: 108 print " [Lliurex-up]: Installation of metapackage is required: " + str(self.targetMetapackage) 109 is_flavour_installed=self.lliurexcore.installInitialFlavour(self.targetMetapackage) 110 self.returncode_initflavour=is_flavour_installed['returncode'] 111 error=is_flavour_installed['stderrs'] 112 log_msg="Install initial flavour:" + self.targetMetapackage + ": Returncode: " + str(self.returncode_initflavour) + " Error: " + str(error) 113 self.log(log_msg) 114 print " [Lliurex-up]: Metapackage is now installed: " + str(returncode) + " Error: " + str(error) 115 116 117 def checkingIncorrectFlavours(self): 118 119 incorrectFlavours=self.lliurexcore.checkIncorrectFlavours() 120 log_msg="Checking incorrect metapackages. Others metapackages detected: " + str(incorrectFlavours) 121 self.log(log_msg) 122 123 return incorrectFlavours 124 125 126 def checkPreviousUpgrade(self): 127 128 error=False 129 if self.returncode_initflavour!=0: 130 error=True 131 132 else: 133 if self.version_update["candidate"]!=None: 134 if self.version_update["installed"]!=self.version_update["candidate"]: 135 error=True 91 136 else: 92 print " [Lliurex-up]: Installation of flavour is not required" 93 else: 94 print " [Lliurex-up]: Installation of flavour is required: " + str(self.targetMetapackage) 95 is_flavour_installed=self.lliurexcore.installInitialFlavour(self.targetMetapackage) 96 returncode=is_flavour_installed['returncode'] 97 error=is_flavour_installed['stderrs'] 98 print " [Lliurex-up]: Flavour is now installed: " + str(returncode) + " Error: " + str(error) 99 100 # def requiresInstallFlavour(self): 101 102 # flavourToInstall=None 103 104 # self.flavours=self.lliurexcore.flavours 105 # if not 'None' in self.previousFlavours: 106 # if self.previousFlavours !=self.flavours: 107 # flavourToInstall=self.parseFlavourToInstall(self.previousFlavours) 108 109 # else: 110 # if self.metapackageRef != self.flavours: 111 # flavourToInstall=self.parseFlavourToInstall(self.metapackageRef) 112 113 # return flavourToInstall 114 115 #def requiresInstallFlavour 116 117 # def parseFlavourToInstall(self,flavours): 118 119 # parse_flavour="" 120 121 # for item in flavours: 122 # if item != "edu": 123 # parse_flavour=parse_flavour + " " + "lliurex-meta-" + item 124 125 # return parse_flavour 126 127 def checkingIncorrectFlavours(self): 128 129 incorrectFlavours=self.lliurexcore.checkIncorrectFlavours() 130 return incorrectFlavours 131 # count=0 132 # ref_flavour=["lliurex-meta-server","lliurex-meta-client", "lliurex-meta-desktop", "lliurex-meta-music", "lliurex-meta-pyme", "lliurex-meta-infantil"] 133 # self.incorrect_flavours=[] 134 135 # for item in self.packages: 136 # if item in ref_flavour: 137 # self.incorrect_flavours.append(item) 138 139 # if len(self.incorrect_flavours)>0: 140 # for item in self.incorrect_flavours: 141 # if self.targetMetapackage != None: 142 # if item != self.targetMetapackage: 143 # count=count+1 144 # else: 145 # meta=item.split("-")[2] 146 # if 'None' in self.previousFlavours: 147 # if not meta in self.metapackageRef: 148 # count=count+1 149 # else: 150 # if not meta in self.previousFlavours: 151 # count=count+1 152 153 # if count>0: 154 # return True 155 # else: 156 # return False 157 158 159 def checkPreviousUpgrade(self): 160 161 error=False 162 if self.version_update["candidate"]!=None: 163 if self.version_update["installed"]!=self.version_update["candidate"]: 164 error=True 165 else: 166 if self.version_update["installed"]!=self.version_available["candidate"]: 167 error=True 137 if self.version_update["installed"]!=self.version_available["candidate"]: 138 error=True 168 139 169 140 return error … … 174 145 try: 175 146 os.system(command) 147 log_msg="Exec Pre-Actions" 148 self.log(log_msg) 176 149 177 150 except Exception as e: 151 log_msg="Exec Pre-Actions. Error " +str(e) 152 self.log(log_msg) 178 153 print e 179 154 … … 183 158 try: 184 159 os.system(command) 160 log_msg="Exec Dist-uggrade" 161 self.log(log_msg) 185 162 except Exception as e: 163 log_msg="Exec Dist-uggrade.Error : " +str(e) 164 self.log(log_msg) 186 165 print e 187 166 188 # def checkFinalFlavour(self): 189 190 # flavourToInstall=None 191 192 # try: 193 # self.targetMetapackage=self.lliurexcore.checkFlavour() 194 # if self.targetMetapackage==None: 195 # flavourToInstall=self.requiresInstallFlavour() 196 # else: 197 # flavourToInstall=self.targetMetapackage 198 199 # except Exception as e: 200 # print e 167 def checkingFinalFlavourToInstall(self): 168 169 #self.flavourToInstall=self.lliurexcore.checkFinalFlavour() 170 self.flavourToInstall=self.lliurexcore.checkFlavour() 171 172 log_msg="Final check metapackage. Metapackage to install: " + str(self.flavourToInstall) 173 self.log(log_msg) 174 175 if self.flavourToInstall!=None: 176 print (" [Lliurex-up]: Install of metapackage is required: " + str(self.flavourToInstall)) 201 177 202 # return flavourToInstall203 204 205 def checkingFinalFlavourToInstall(self):206 207 self.flavourToInstall=self.lliurexcore.checkFinalFlavour()208 209 if self.flavourToInstall!=None:210 print (" [Lliurex-up]: Install of meta is required: " + str(self.flavourToInstall))211 178 command=self.lliurexcore.installFinalFlavour(self.flavourToInstall) 212 179 try: 213 180 os.system(command) 181 214 182 except Exception as e: 215 183 print e 216 184 else: 217 print (" [Lliurex-up]: Meta is correct. Nothing to do") 218 219 return 185 print (" [Lliurex-up]: metapackage is correct. Nothing to do") 220 186 221 187 … … 225 191 try: 226 192 os.system(command) 193 log_msg="Exec Post-Actions" 194 self.log(log_msg) 227 195 except Exception as e: 228 196 print e … … 230 198 def checkFinalUpgrade(self): 231 199 232 print (" [Lliurex-up]: Checking ")200 print (" [Lliurex-up]: Checking Dist-upgrade ") 233 201 error=self.lliurexcore.checkErrorDistUpgrade() 234 202 235 # cmd='dpkg -l | grep "^i[^i]" >' + self.errorupgrade_token236 # os.system(cmd)237 238 # if os.path.exists(self.errorupgrade_token):239 # aux = open(self.errorupgrade_token,'r')240 # lines = aux.readlines()241 # aux.close()242 243 # if len(lines)>0:244 # error=True245 246 # else:247 # j=0248 # cmd='apt-get dist-upgrade -sV >' + self.finalupgrade_token249 # os.system(cmd)250 # if os.path.exists(self.finalupgrade_token):251 # aux = open(self.finalupgrade_token,'r')252 # lines = aux.readlines()253 # aux.close()254 255 # for x in lines:256 # if 'Inst' in x:257 # j=j+1258 259 # if j>0:260 # error=True261 203 if error: 262 204 print(" [Lliurex-up]: The updated process is endend with errors") 205 log_msg="Dist-upgrade process ending with errors" 263 206 264 207 else: 265 print(" [Lliurex-up]: The system is now update") 208 print(" [Lliurex-up]: The system is now update") 209 log_msg="Dist-upgrade process ending OK" 210 211 self.log(log_msg) 212 213 def log(self,msg): 214 215 log_file="/var/log/lliurex-up.log" 216 f=open(log_file,"a+") 217 f.write(msg + '\n') 218 f.close() 266 219 267 220 def main(self,mode): … … 271 224 272 225 else: 226 mode="nomal" 273 227 self.initActionsArg="initActions" 274 228 229 log_msg="Mode of execution: " + str(mode) 230 self.log(log_msg) 231 275 232 print(" [Lliurex-up]: Checking system") 276 233 self.initActionsScript() … … 281 238 print(" [Lliurex-up]: Checking LliurexVersion from local repository") 282 239 self.version_update=self.lliurexcore.getLliurexVersionLocal() 240 log_msg="Get LliurexVersion installed: " + str(self.version_update["installed"]) 241 self.log(log_msg) 242 log_msg="Get LliurexVersion candidate from Local repository: " + str(self.version_update["candidate"]) 243 self.log(log_msg) 244 283 245 print(" [Lliurex-up]: Checking LliurexVersion from lliurex.net") 284 246 self.version_available=self.lliurexcore.getLliurexVersionLliurexNet() 247 log_msg="Get LliurexVersion candidate from Lliurex Net: " + str(self.version_available["candidate"]) 248 self.log(log_msg) 285 249 286 250 print(" [Lliurex-up]: Checking if installation of flavour is required") … … 293 257 if len(self.packages)>0: 294 258 print(" [Lliurex-up]:List of packages to update") 259 log_msg="Number of packages: "+ str(len(self.packages)) 260 self.log(log_msg) 261 295 262 for item in self.packages: 296 263 print item + ": " + self.packages[item]["candidate"] … … 310 277 311 278 else: 279 log_msg="Cancel the update" 280 self.log(log_msg) 312 281 print(" [Lliurex-up]: Cancel the update") 313 282 self.lliurexcore.cleanEnvironment() -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/LliurexUpConnect.py
r3449 r3493 6 6 import threading 7 7 import datetime 8 from math import pi 8 import math 9 #from math import pi 9 10 10 11 import lliurex.lliurexup as LliurexUpCore … … 22 23 self.llxUpCore=LliurexUpCore.LliurexUpCore() 23 24 GObject.threads_init() 24 log_msg="------------------------------------------\n"+"LLIUREX-UP STARTING AT: " + datetime.datetime.today().strftime("%d/%m/%y %H:%M:%S") +"\n------------------------------------------"25 log_msg="------------------------------------------\n"+"LLIUREX-UP-GUI STARTING AT: " + datetime.datetime.today().strftime("%d/%m/%y %H:%M:%S") +"\n------------------------------------------" 25 26 self.log(log_msg) 26 27 … … 44 45 45 46 self.targetMetapackage=self.llxUpCore.checkInitialFlavour() 46 log_msg="Initial check metapackage. Metapackage to install: " + str(self. llxUpCore.targetMetapackage)47 log_msg="Initial check metapackage. Metapackage to install: " + str(self.targetMetapackage) 47 48 self.log(log_msg) 48 49 log_msg="Get initial flavours: " + str(self.llxUpCore.previuosFlavours) … … 327 328 #ref_flavour=["lliurex-meta-server","lliurex-meta-client", "lliurex-meta-desktop", "lliurex-meta-music", "lliurex-meta-pyme", "lliurex-meta-infantil"] 328 329 packages_parse=[] 330 self.total_size=0 329 331 #self.incorrect_flavours=[] 330 332 … … 333 335 if len(packages)>0: 334 336 for item in packages: 335 version=packages[item] 336 packages_parse.append(item+";"+version['candidate']+";"+'20Mb') 337 version=packages[item]['candidate'] 338 size=self.getSizePackagesToUpdate(item) 339 install=str(packages[item]['install']) 340 packages_parse.append(item+";"+version+";"+size+";"+install) 337 341 338 342 log_msg="Get packages to update. Number of packages: " + str(len(packages)) … … 343 347 self.log(log_msg) 344 348 345 return packages_parse 349 self.total_size=self.convert_size(self.total_size) 350 return packages_parse,self.total_size 346 351 347 352 #def getPackagesToUpdate 348 349 350 353 354 def getSizePackagesToUpdate(self,pkg): 355 size=0 356 try: 357 command='apt-cache show ' + pkg + ' |grep "^Size:" |cut -d " " -f2 |head -1' 358 p=subprocess.Popen(command,shell=True,stdout=subprocess.PIPE) 359 size=p.stdout.readline().strip() 360 self.total_size=(self.total_size)+int(size) 361 size=self.convert_size(size) 362 return size 363 364 except Exception as e: 365 print e 366 return self.convert_size(size) 367 368 369 def convert_size(self,size_bytes): 370 371 size_bytes=float(size_bytes) 372 if (size_bytes == 0): 373 return '0B' 374 375 size_name = ("B", "KB", "MB", "GB") 376 i = int(math.floor(math.log(size_bytes, 1024))) 377 p = math.pow(1024, i) 378 s = round(size_bytes/p,) 379 s=int(s) 380 return '%s %s' % (s, size_name[i]) 381 351 382 352 383 def checkIncorrectFlavours(self): … … 399 430 print e 400 431 log_msg="Error checking distupgrade. Error: " + str(e) 432 self.log(log_msg) 401 433 error=True 402 434 -
lliurex-up/trunk/fuentes/lliurex-up/usr/share/lliurex-up/lliurex-up.py
r3453 r3493 34 34 DONE_ICON=BASE_DIR+"rsrc/done.png" 35 35 ERROR_ICON=BASE_DIR+"rsrc/error.png" 36 DESKTOP_PATH="/usr/share/applications" 36 37 37 38 class Package: 38 39 39 40 #def __init__(self,name,version,size,desktop_file,changelog_file): 40 def __init__(self,name,version ):41 def __init__(self,name,version,size): 41 42 self.name=name 42 43 self.version=version 43 #self.size=size 44 #self.parse_desktop(desktop_file) 44 self.size=size 45 desktop_file=os.path.join(DESKTOP_PATH,name+".desktop") 46 self.parse_desktop(desktop_file) 45 47 #self.parse_changelog(changelog_file) 46 48 self.parse_installed_icon(CACHED_ICON) … … 53 55 config = ConfigParser.ConfigParser() 54 56 config.optionxform=str 57 55 58 config.read(desktop_file) 56 59 57 60 if config.has_section("Desktop Entry") and config.has_option("Desktop Entry","Icon"): 58 61 self.icon=config.get("Desktop Entry","Icon") 62 icon_extension=os.path.splitext(self.icon)[1] 63 if icon_extension==".xpm": 64 self.icon="package" 59 65 else: 60 66 self.icon="package" … … 228 234 229 235 #self.packages_store=Gtk.ListStore(str,str,str,GdkPixbuf.Pixbuf) 230 self.packages_store=Gtk.ListStore(str, GdkPixbuf.Pixbuf)236 self.packages_store=Gtk.ListStore(str,str,str,GdkPixbuf.Pixbuf) 231 237 self.packages_tv.set_model(self.packages_store) 232 #column=Gtk.TreeViewColumn("")233 #cell=Gtk.CellRendererPixbuf()234 #cell.set_property("stock-size",Gtk.IconSize.DIALOG)235 #column.pack_start(cell,True)236 #column.add_attribute(cell,"icon-name",0)237 #self.packages_tv.append_column(column)238 column=Gtk.TreeViewColumn("") 239 cell=Gtk.CellRendererPixbuf() 240 cell.set_property("stock-size",Gtk.IconSize.DIALOG) 241 column.pack_start(cell,True) 242 column.add_attribute(cell,"icon-name",0) 243 self.packages_tv.append_column(column) 238 244 239 245 column=Gtk.TreeViewColumn("Package") 240 246 cell=Gtk.CellRendererText() 241 247 column.pack_start(cell,True) 242 column.add_attribute(cell,"markup", 0)248 column.add_attribute(cell,"markup",1) 243 249 column.set_expand(True) 244 250 … … 248 254 # self.packages_tv.connect("button-release-event",self.package_clicked) 249 255 250 #column=Gtk.TreeViewColumn("Size")251 #cell=Gtk.CellRendererText()252 #cell.set_property("alignment",Pango.Alignment.CENTER)253 #column.pack_start(cell,False)254 # column.add_attribute(cell,"markup",1)255 #self.packages_tv.append_column(column)256 column=Gtk.TreeViewColumn("Size") 257 cell=Gtk.CellRendererText() 258 cell.set_property("alignment",Pango.Alignment.CENTER) 259 column.pack_start(cell,False) 260 column.add_attribute(cell,"markup",2) 261 self.packages_tv.append_column(column) 256 262 257 263 … … 262 268 cell=Gtk.CellRendererPixbuf() 263 269 column.pack_start(cell,True) 264 column.add_attribute(cell,"pixbuf", 1)270 column.add_attribute(cell,"pixbuf",3) 265 271 self.packages_tv.append_column(column) 266 272 … … 584 590 self.pbar_label.hide() 585 591 #self.spinner.stop() 586 msg_gather="<span><b>"+_("Your mirror is not update. Do you want to update it?")+"</b></span>"592 msg_gather="<span><b>"+_("Your mirror is not update. Do you want to update it?")+"</b></span>" 587 593 self.gather_label.set_markup(msg_gather) 588 594 #GLib.timeout_add(100,self.pulsate_wait_response) … … 927 933 def gather_packages(self): 928 934 929 self.packages =self.llxup_connect.getPackagesToUpdate()935 self.packages,self.size_update=self.llxup_connect.getPackagesToUpdate() 930 936 self.incorrect_flavours=self.llxup_connect.checkIncorrectFlavours() 931 937 self.gather_packages_t.done=True … … 963 969 964 970 self.number_pkg=len(self.packages) 965 self.size_update_label.hide() 971 972 self.size_update_label.show() 966 973 #self.size_update="100 Mb" 967 974 968 975 969 msg_number_info="<span foreground='#3366cc'><b>"+str(self.number_pkg)+ "</b></span>"970 #msg_size="<span foreground='#3366cc'><b>"+self.size_update+"</b></span>"976 msg_number_info="<span foreground='#3366cc'><b>"+str(self.number_pkg)+ " ("+"</b></span>"+"<span foreground='#3366cc'><b>"+str(self.newpackages)+ _(" news)")+"</b></span>" 977 msg_size="<span foreground='#3366cc'><b>"+self.size_update+"</b></span>" 971 978 972 979 self.current_version_label_info.set_markup(msg_current_version_info) … … 974 981 self.version_update_label_info.set_markup(msg_version_update_info) 975 982 self.number_packages_label_info.set_markup(msg_number_info) 976 #self.size_update_label_info.set_markup(msg_size)983 self.size_update_label_info.set_markup(msg_size) 977 984 978 985 #def get_update_summary … … 1010 1017 for package in self.package_list: 1011 1018 #self.packages_store.append((package.icon,"<span font='Roboto'><b>"+package.name+"</b></span>\n"+"<span font='Roboto' size='small'>"+package.version+"</span>","<span font='Roboto' size='large'><b>"+package.size+"</b></span>",package.installed)) 1012 self.packages_store.append(( "<span font='Roboto'><b>"+package.name+"</b></span>\n"+"<span font='Roboto' size='small'>"+package.version+"</span>",package.installed))1019 self.packages_store.append((package.icon,"<span font='Roboto'><b>"+package.name+"</b></span>\n"+"<span font='Roboto' size='small'>"+package.version+"</span>","<span font='Roboto' size='small'>"+package.size+"</span>", package.installed)) 1013 1020 1014 1021 #print len(self.packages_store) … … 1018 1025 def parse_packages_updated(self): 1019 1026 1020 1027 self.newpackages=0 1021 1028 for item in self.packages: 1022 1029 tmp=item.split(";") 1023 1030 if len(tmp)>1: 1024 pack=Package(tmp[0],tmp[1] )1031 pack=Package(tmp[0],tmp[1],tmp[2]) 1025 1032 self.package_list.append(pack) 1026 1033 if tmp[3]==str(None): 1034 self.newpackages=int(self.newpackages)+1 1027 1035 1028 1036 #def parse_simulate_output … … 1032 1040 selection=self.packages_tv.get_selection() 1033 1041 model,iter=selection.get_selected() 1034 name=self.packages_store.get_value(iter,1) 1042 #name=self.packages_store.get_value(iter,1) 1043 name=model[iter][1] 1035 1044 name=name[name.find("<b>")+3:name.find("</b>")] 1036 1045 … … 1251 1260 1252 1261 for item in self.packages_store: 1253 name=item[ 0].split(">")[2]1262 name=item[1].split(">")[2] 1254 1263 name=name.split("<")[0] 1255 version=item[ 0].split(">")[5]1264 version=item[1].split(">")[5] 1256 1265 version=version.split("<")[0] 1257 1266 tmp=str(name)+"_"+str(version) 1258 1267 if tmp in packages_status: 1259 item[ 1]=iconok1268 item[2]=iconok 1260 1269 else: 1261 item[ 1]=iconerr1270 item[2]=iconerr 1262 1271 1263 1272 #def update_installed_icon -
lliurex-up/trunk/fuentes/python-lliurex-up/lliurex/lliurexup/__init__.py
r3449 r3493 98 98 f.close() 99 99 100 def writeDefaultSourceslistMirror(self): 101 f = open(os.path.join(self.processSourceslist,'default_mirror'),'w') 102 f.write('deb http://mirror/{version_mirror} {version} main restricted universe multiverse\n'.format(version_mirror=self.defaultMirror,version=self.defaultVersion)) 103 f.write('deb http://mirror/{version_mirror} {version}-updates main restricted universe multiverse\n'.format(version_mirror=self.defaultMirror,version=self.defaultVersion)) 104 f.write('deb http://mirror/{version_mirror} {version}-security main restricted universe multiverse\n'.format(version_mirror=self.defaultMirror,version=self.defaultVersion)) 105 f.close() 106 100 107 def prepareEnvironment(self): 101 108 ''' … … 109 116 os.mkdir(self.changelogsPath) 110 117 self.writeDefaultSourceslist() 111 118 self.writeDefaultSourceslistMirror() 112 119 113 120 def addSourcesListLliurex(self): … … 115 122 self.origsourcesfile=os.path.join(self.sourcesListPath,"sources.list") 116 123 self.origsourcesfileback=os.path.join(self.sourcesListPath,"lliurexup_sources.list") 117 sourcesref=os.path.join(self.processSourceslist, 'default') 124 sourcesrefmirror=os.path.join(self.processSourceslist, 'default_mirror') 125 118 126 newsourcesfile=os.path.join(self.sourcesListPath,'sources.list') 119 127 extrasources=[] 120 128 121 129 122 if self.targetMetapackage=="lliurex-meta-server" or "server" in self.previuosFlavours or "server" in self.metapackageRef: 123 if os.path.exists(self.origsourcesfile): 124 os.rename(self.origsourcesfile,self.origsourcesfileback) 125 origsources=open(self.origsourcesfileback,'r') 126 for line in origsources: 127 if not "lliurex" in line: 128 extrasources.append(line.strip()) 129 origsources.close() 130 if self.targetMetapackage=="lliurex-meta-client" or "client" in self.previuosFlavours or "client" in self.metapackageRef: 131 textsearch="/mirror/"+str(self.defaultMirror) 132 sourcesref=os.path.join(self.processSourceslist, 'default_mirror') 133 134 else: 135 textsearch="/lliurex.net/"+str(self.defaultVersion) 136 sourcesref=os.path.join(self.processSourceslist, 'default') 137 138 if os.path.exists(self.origsourcesfile): 139 os.rename(self.origsourcesfile,self.origsourcesfileback) 140 origsources=open(self.origsourcesfileback,'r') 141 for line in origsources: 142 if not textsearch in line: 143 extrasources.append(line.strip()) 144 origsources.close() 130 145 131 146 if os.path.exists(sourcesref):
Note: See TracChangeset
for help on using the changeset viewer.