Changeset 3414


Ignore:
Timestamp:
Jan 26, 2017, 10:35:15 AM (2 years ago)
Author:
Juanma
Message:

Added component preschool to the sources when installing infantil flavour

Location:
zero-lliurex-flavours/trunk/fuentes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • zero-lliurex-flavours/trunk/fuentes/debian/changelog

    r3409 r3414  
    1 zero-lliurex-flavours (0.9.17-lliurex) xenial; urgency=medium
     1zero-lliurex-flavours (0.9.17-lliurex+1) xenial; urgency=medium
    22
    3   * Adds recursos repository when installing infantil flavour
     3  * Added component "preschool" to the sources when installing infantil flavour
    44
    55 -- Juanma Navarro Mañez <juanma1980@gmail.com>  Wed, 25 Jan 2017 12:22:36 +0100
  • zero-lliurex-flavours/trunk/fuentes/install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py

    r3407 r3414  
    1212import platform
    1313import subprocess
    14 import glob
    1514import sys
    1615import datetime
     
    441440                p=subprocess.Popen([command],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE) 
    442441                output=p.communicate()
    443                 #Check if we're installing infantil flavour
    444                 if "lliurex-meta-infantil" in command:
    445                         log_msg=("Removing recursos repository from sources")
    446                         self.log(log_msg)
    447                         reposInfantil=glob.glob("/etc/apt/sources.list.d/*recursos*")
    448                         for repo in reposInfantil:
    449                                 os.remove(repo)
    450                         cmdInfantil=("apt-get","update")
    451                         x=subprocess.Popen(cmdInfantil,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    452                         x.communicate()
    453442                self.thread_ret=p.returncode
    454443                self.flavour_error=output[1]
     
    586575                for item in self.install_metas:
    587576                        if item.info["pkg"]=="lliurex-meta-infantil":
    588                                 cmdInfantil=["sudo","/usr/bin/add-apt-repository", "ppa:llxdev/recursos"]
     577                                cmdInfantil=["sudo","/usr/bin/add-apt-repository", "deb http://lliurex.net/xenial/ xenial preschool"]
    589578                                x=subprocess.Popen((cmdInfantil),stdin=subprocess.PIPE,stdout=subprocess.PIPE)
    590579                                log_msg="Adding repository recursos"
Note: See TracChangeset for help on using the changeset viewer.