Changeset 6950

Timestamp:

Mar 2, 2018, 11:53:56 AM (22 months ago)

Author:

hectorgh

Message:

using langpacks file instead of apt-installed

Location:

lliurex-ubiquity-addons/trunk/fuentes/src

Files:

• UbiLliureXExtraPackages.py (modified) (2 diffs)
• UbiLliureXFlash.py (modified) (1 diff)

lliurex-ubiquity-addons/trunk/fuentes/src/UbiLliureXExtraPackages.py

@@ -102 +102 @@
 
                 os.system("mkdir -p /var/lib/ubiquity/")
+                
+                # Using langpacks file instead of apt-installed. Ubiquity uses cdrom repository only when using apt-installed list
+                list_file="/var/lib/ubiquity/langpacks"
+                
                 #Clean the file
                 for p in all_avaiable_packages:
-                        f = open("/var/lib/ubiquity/apt-installed","r")
+                        f = open(list_file,"r")
                         lines = f.readlines()
                         f.close()
-                        f = open("/var/lib/ubiquity/apt-installed","w")
+                        f = open(list_file,"w")
                         for line in lines:
                                 if line!=p+"\n":
@@ -114 +118 @@
                         
                 for p in list_packages:
-                        f = open("/var/lib/ubiquity/apt-installed","a")
+                        f = open(list_file,"a")
                         f.write(str(p)+"\n")
                         f.close()

lliurex-ubiquity-addons/trunk/fuentes/src/UbiLliureXFlash.py

@@ -58 +58 @@
         def ok_handler(self):
                 list_packages = []
+                
+                # Using langpacks file instead of apt-installed. Ubiquity uses cdrom repository only when using apt-installed list
+                list_file="/var/lib/ubiquity/langpacks"
                 if self.ui.installFlash.get_active():
                         os.system("mkdir -p /var/lib/ubiquity/")
-                        f = open("/var/lib/ubiquity/apt-installed","a")
+                        f = open(list_file,"a")
                         f.write("adobe-flashplugin\n")
                         f.close()
                 else:
-                        if os.path.exists("/var/lib/ubiquity/apt-installed"):
-                                f = open("/var/lib/ubiquity/apt-installed","r")
+                        if os.path.exists(list_file):
+                                f = open(list_file,"r")
                                 lines = f.readlines()
                                 f.close()
-                                f = open("/var/lib/ubiquity/apt-installed","w")
+                                f = open(list_file,"w")
                                 for line in lines:
                                         if line!="adobe-flashplugin"+"\n":