Changeset 1478

Timestamp:

May 11, 2016, 3:24:59 PM (5 years ago)

Author:

daduve

Message:

New patches

Location:

ubiquity/trunk/fuentes/debian/patches

Files:

• nolangpacksinatall.patch (modified) (3 diffs)
• targetposthooks.patch (modified) (3 diffs)

ubiquity/trunk/fuentes/debian/patches/nolangpacksinatall.patch

@@ -1 @@
-diff -Nuar ubiquity.old/ubiquity/install_misc.py ubiquity/ubiquity/install_misc.py
---- ubiquity.orig/ubiquity/install_misc.py      2016-05-11 14:38:37.819777667 +0200
-+++ ubiquity/ubiquity/install_misc.py   2016-05-11 14:28:18.855762080 +0200
-@@ -1108,27 +1108,27 @@
+diff -Nuar ubiquity/ubiquity/install_misc.py ubiquity.orig/ubiquity/install_misc.py
+--- ubiquity/ubiquity/install_misc.py   2016-05-11 14:59:08.311808655 +0200
++++ ubiquity.orig/ubiquity/install_misc.py      2016-05-11 15:02:09.379813215 +0200
+@@ -1108,13 +1108,26 @@
          langpacks_file = '/var/lib/ubiquity/langpacks'
          if os.path.exists(langpacks_file):
              osextras.unlink_force(langpacks_file)
--         p1 = subprocess.Popen(['dpkg','-l'],stdout=subprocess.PIPE).communicate()[0]
--         p1 = p1.decode('utf-8')
--         list_packages = p1.split('\n')
--         installed_language_pack = []
--         for package in list_packages:
--             try:
--                 package_name = package.split(' ')[2]
--                 if package_name.startswith('language-pack-'):
--                     installed_language_pack.append(package_name)
--             except:
--                 pass
 +        p1 = subprocess.Popen(['dpkg','-l'],stdout=subprocess.PIPE).communicate()[0]
 +        p1 = p1.decode('utf-8')
@@ -28 +17 @@
 +            except:
 +                pass
- 
--       if install_new:
-+        if install_new:
++
+         if install_new:
              if save:
                  if not os.path.exists(os.path.dirname(langpacks_file)):
@@ -36 +24 @@
                  with open(langpacks_file, 'w') as langpacks:
                      for pkg in to_install:
-                         if pkg not in installed_language_pack:
--                               print(pkg, file=langpacks)
--               return []
+-                        print(pkg, file=langpacks)
++                       if pkg not in installed_language_pack:
 +                            print(pkg, file=langpacks)
-+                return []
+                 return []
              else:
                  return to_install
-

ubiquity/trunk/fuentes/debian/patches/targetposthooks.patch

@@ -1 @@
---- ubiquity.orig/scripts/install.py    2014-04-22 13:29:58.000000000 +0200
-+++ ubiquity/scripts/install.py 2014-12-05 13:40:44.579816561 +0100
+diff -Nuar ubiquity.orig/scripts/install.py ubiquity/scripts/install.py
+--- ubiquity.orig/scripts/install.py    2016-05-11 14:58:57.503808383 +0200
++++ ubiquity/scripts/install.py 2016-05-11 15:22:29.231843935 +0200
 @@ -133,6 +133,7 @@
                      preexec_fn=subprocess_setup)
@@ -9 +10 @@
                  if e.errno in (errno.ENOENT, errno.EIO, errno.EFAULT,
                                 errno.ENOTDIR, errno.EROFS):
-@@ -721,6 +722,29 @@
+@@ -727,6 +728,28 @@
+                     not misc.execute('losetup', '-d', dev)):
                  raise install_misc.InstallStepError(
                      "Failed to detach loopback device %s" % dev)
- 
 +    def run_target_post_hooks(self):
 +        """Run hook scripts from /usr/lib/ubiquity/target-postconfig. This allows
@@ -35 +36 @@
 +                self.db.progress('STEP', 1)
 +            self.db.progress('STOP')
-+
+ 
      def select_ecryptfs(self):
          """Is ecryptfs in use by an existing user? If so, keep it installed.
-