Changeset 1476


Ignore:
Timestamp:
May 11, 2016, 2:44:57 PM (3 years ago)
Author:
daduve
Message:

new patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ubiquity/trunk/fuentes/debian/patches/nolangpacksinatall.patch

    r1056 r1476  
    11diff -Nuar ubiquity.old/ubiquity/install_misc.py ubiquity/ubiquity/install_misc.py
    2 --- ubiquity.old/ubiquity/install_misc.py       2013-02-18 11:50:49.026884728 +0100
    3 +++ ubiquity/ubiquity/install_misc.py   2013-02-18 13:07:03.261567131 +0100
    4 @@ -1090,6 +1090,18 @@
     2--- ubiquity.orig/ubiquity/install_misc.py      2016-05-11 14:38:37.819777667 +0200
     3+++ ubiquity/ubiquity/install_misc.py   2016-05-11 14:28:18.855762080 +0200
     4@@ -1108,27 +1108,27 @@
    55         langpacks_file = '/var/lib/ubiquity/langpacks'
    66         if os.path.exists(langpacks_file):
    77             osextras.unlink_force(langpacks_file)
     8-         p1 = subprocess.Popen(['dpkg','-l'],stdout=subprocess.PIPE).communicate()[0]
     9-         p1 = p1.decode('utf-8')
     10-         list_packages = p1.split('\n')
     11-         installed_language_pack = []
     12-         for package in list_packages:
     13-             try:
     14-                 package_name = package.split(' ')[2]
     15-                 if package_name.startswith('language-pack-'):
     16-                     installed_language_pack.append(package_name)
     17-             except:
     18-                 pass
    819+        p1 = subprocess.Popen(['dpkg','-l'],stdout=subprocess.PIPE).communicate()[0]
    920+        p1 = p1.decode('utf-8')
     
    1728+            except:
    1829+                pass
    19 +
    20          if install_new:
     30 
     31-       if install_new:
     32+        if install_new:
    2133             if save:
    2234                 if not os.path.exists(os.path.dirname(langpacks_file)):
    23 @@ -1096,7 +1108,8 @@
    2435                     os.makedirs(os.path.dirname(langpacks_file))
    2536                 with open(langpacks_file, 'w') as langpacks:
    2637                     for pkg in to_install:
    27 -                        print(pkg, file=langpacks)
    28 +                        if pkg not in installed_language_pack:
     38                         if pkg not in installed_language_pack:
     39-                               print(pkg, file=langpacks)
     40-               return []
    2941+                            print(pkg, file=langpacks)
    30                  return []
     42+                return []
    3143             else:
    3244                 return to_install
Note: See TracChangeset for help on using the changeset viewer.