Changeset 3404

Timestamp:

Jan 25, 2017, 2:15:55 PM (2 years ago)

Author:

Juanma

Message:

Adds recursos repository when installing infantil flavour

File:

• zero-lliurex-flavours/trunk/fuentes/install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py (modified) (3 diffs)

zero-lliurex-flavours/trunk/fuentes/install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py

@@ -12 +12 @@
 import platform
 import subprocess
-from subprocess import PIPE
+import glob
 import sys
 import datetime
@@ -441 +441 @@
                 p=subprocess.Popen([command],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)  
                 output=p.communicate()
+                #Check if we're installing infantil flavour
+                if "lliurex-meta-infantil" in command:
+                        reposInfantil=glob.glob("etc/apt/sources.list.d/*recursos*")
+                        for repo in reposInfantil:
+                                os.remove(repo)
+                        cmdInfantil=("apt-get","update")
+                        x=subprocess.Popen(cmdInfantil,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        x.communicate()
                 self.thread_ret=p.returncode
                 self.flavour_error=output[1]
@@ -577 +585 @@
                         if item.info["pkg"]=="lliurex-meta-infantil":
                                 cmdInfantil=["sudo","/usr/bin/add-apt-repository", "ppa:llxdev/recursos"]
-                                x=subprocess.Popen((cmdInfantil),stdin=PIPE,stdout=PIPE)
+                                x=subprocess.Popen((cmdInfantil),stdin=subprocess.PIPE,stdout=subprocess.PIPE)
                                 log_msg="Adding repository recursos"
                                 self.log(log_msg)