Changeset 1478 for ubiquity


Ignore:
Timestamp:
May 11, 2016, 3:24:59 PM (3 years ago)
Author:
daduve
Message:

New patches

Location:
ubiquity/trunk/fuentes/debian/patches
Files:
2 edited

Legend:

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

    r1476 r1478  
    1 diff -Nuar ubiquity.old/ubiquity/install_misc.py ubiquity/ubiquity/install_misc.py
    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 @@
     1diff -Nuar ubiquity/ubiquity/install_misc.py ubiquity.orig/ubiquity/install_misc.py
     2--- ubiquity/ubiquity/install_misc.py   2016-05-11 14:59:08.311808655 +0200
     3+++ ubiquity.orig/ubiquity/install_misc.py      2016-05-11 15:02:09.379813215 +0200
     4@@ -1108,13 +1108,26 @@
    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
    198+        p1 = subprocess.Popen(['dpkg','-l'],stdout=subprocess.PIPE).communicate()[0]
    209+        p1 = p1.decode('utf-8')
     
    2817+            except:
    2918+                pass
    30  
    31 -       if install_new:
    32 +        if install_new:
     19+
     20         if install_new:
    3321             if save:
    3422                 if not os.path.exists(os.path.dirname(langpacks_file)):
     
    3624                 with open(langpacks_file, 'w') as langpacks:
    3725                     for pkg in to_install:
    38                          if pkg not in installed_language_pack:
    39 -                               print(pkg, file=langpacks)
    40 -               return []
     26-                        print(pkg, file=langpacks)
     27+                       if pkg not in installed_language_pack:
    4128+                            print(pkg, file=langpacks)
    42 +                return []
     29                 return []
    4330             else:
    4431                 return to_install
    45 
  • ubiquity/trunk/fuentes/debian/patches/targetposthooks.patch

    r1056 r1478  
    1 --- ubiquity.orig/scripts/install.py    2014-04-22 13:29:58.000000000 +0200
    2 +++ ubiquity/scripts/install.py 2014-12-05 13:40:44.579816561 +0100
     1diff -Nuar ubiquity.orig/scripts/install.py ubiquity/scripts/install.py
     2--- ubiquity.orig/scripts/install.py    2016-05-11 14:58:57.503808383 +0200
     3+++ ubiquity/scripts/install.py 2016-05-11 15:22:29.231843935 +0200
    34@@ -133,6 +133,7 @@
    45                     preexec_fn=subprocess_setup)
     
    910                 if e.errno in (errno.ENOENT, errno.EIO, errno.EFAULT,
    1011                                errno.ENOTDIR, errno.EROFS):
    11 @@ -721,6 +722,29 @@
     12@@ -727,6 +728,28 @@
     13                     not misc.execute('losetup', '-d', dev)):
    1214                 raise install_misc.InstallStepError(
    1315                     "Failed to detach loopback device %s" % dev)
    14  
    1516+    def run_target_post_hooks(self):
    1617+        """Run hook scripts from /usr/lib/ubiquity/target-postconfig. This allows
     
    3536+                self.db.progress('STEP', 1)
    3637+            self.db.progress('STOP')
    37 +
     38 
    3839     def select_ecryptfs(self):
    3940         """Is ecryptfs in use by an existing user? If so, keep it installed.
    40  
Note: See TracChangeset for help on using the changeset viewer.