Changeset 4611

Timestamp:

May 5, 2017, 2:47:56 PM (2 years ago)

Author:

daduve

Message:

Adding support to lliurex.net and mirror in server

File:

• lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/usr/share/n4d/python-plugins/LliureXRemoteInstaller.py (modified) (6 diffs)

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/usr/share/n4d/python-plugins/LliureXRemoteInstaller.py

@@ -7 +7 @@
         
         N4D_VAR="LLX_REMOTE_INSTALLER"
-        initial_dict={'deb': {'url': 'http://server/llx-remote/', 'packages': []}, 'sh': {'url': 'http://server/llx-remote/', 'packages': []}, 'apt': {}}
+        initial_dict={'deb': {'url': 'http://server/llx-remote/', 'packages': []}, 'sh': {'url': 'http://server/llx-remote/', 'packages': []}, 'apt': {'Mirror':{'url':'mirror', 'packages': []},'LliureX':{'url':'lliurex', 'packages': []}}}
         
         #VALOR VARIABLE DEL REPO ADDAPLICATION_SOURCES
@@ -35 +35 @@
                         print "------------------------------------"
                         import xmlrpclib as x
+                        ppa_lliurex=False
+                        ppa_mirror=False
                         c=x.ServerProxy("https://server:9779")
                         u=(user,passwd)
@@ -57 +59 @@
                                 return [True,str(COMMENT)]
                         else:
+                                for x in VALOR[self.APT]:
+                                        if x in ["LliureX"]:
+                                                ppa_lliurex=True
+                                        elif x in ["Mirror"]:
+                                                ppa_mirror=True
+                                if not ppa_lliurex:
+                                        print "No tiene lliurex.net"
+                                        VALOR[self.APT].update({'LliureX':{'url':'lliurex', 'packages': []}})
+                                        objects["VariablesManager"].set_variable(namevar,VALOR)
+                                if not ppa_mirror:
+                                        print "No tiene mirror"
+                                        VALOR[self.APT].update({'Mirror':{'url':'mirror', 'packages': []}})
+                                        objects["VariablesManager"].set_variable(namevar,VALOR)
                                 COMMENT=("[LLXRemoteInstaller] (test_var) %s Variable exists in your system, it hasn't been created again" %namevar)
                                 print ("%s" %COMMENT)
@@ -249 +264 @@
                         restore=False
                         ubuntu=["deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse","deb http://archive.ubuntu.com/ubuntu xenial-security main restricted universe multiverse","deb http://archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse"]
+                        lliurex_net=["deb http://lliurex.net/xenial xenial main restricted universe multiverse","deb http://lliurex.net/xenial xenial-security main restricted universe multiverse","deb http://lliurex.net/xenial xenial-updates main restricted universe multiverse"]
+                        lliurex_mirror=["deb http://mirror/llx16 xenial main restricted universe multiverse","deb http://mirror/llx16 xenial-security main restricted universe multiverse","deb http://mirror/llx16 xenial-updates main restricted universe multiverse"]
                         for x in dict[self.APT]:
                                 print "[LLXRemoteInstaller](test_apt_list) Comprobando el PPA: %s"%x
@@ -257 +274 @@
                                         for line in ubuntu:
                                                 self.repo_add(line)
-                                        if self.repo_add(url)[0]:
+                                        if x in ["LliureX"]:
+                                                for line in lliurex_net:
+                                                        self.repo_add(line)
+                                                COMMENT="[LLXRemoteInstaller](test_apt_list) Repo esta ADDED"
+                                                print COMMENT
+                                                list_apt=list_apt+list_apt_testing
+                                                restore=True
+                                                print "[LLXRemoteInstaller](test_apt_list) Anyadimos las APT del repo anterior, nueva lista: %s"%(list_apt)
+                                        elif x in ["Mirror"]:
+                                                for line in lliurex_mirror:
+                                                        self.repo_add(line)
                                                 COMMENT="[LLXRemoteInstaller](test_apt_list) Repo esta ADDED"
                                                 print COMMENT
@@ -264 +291 @@
                                                 print "[LLXRemoteInstaller](test_apt_list) Anyadimos las APT del repo anterior, nueva lista: %s"%(list_apt)
                                         else:
-                                                self.repo_restore(self.file_sources)
-                                                COMMENT="[LLXRemoteInstaller](test_apt_list) Repo no se puede ADDED - PROBLEM"
-                                                return [False,list_apt,COMMENT]
+                                                if self.repo_add(url)[0]:
+                                                        COMMENT="[LLXRemoteInstaller](test_apt_list) Repo esta ADDED"
+                                                        print COMMENT
+                                                        list_apt=list_apt+list_apt_testing
+                                                        restore=True
+                                                        print "[LLXRemoteInstaller](test_apt_list) Anyadimos las APT del repo anterior, nueva lista: %s"%(list_apt)
+                                                else:
+                                                        self.repo_restore(self.file_sources)
+                                                        COMMENT="[LLXRemoteInstaller](test_apt_list) Repo no se puede ADDED - PROBLEM"
+                                                        return [False,list_apt,COMMENT]
                         
                         if list_apt not in ["",None,[]] :