source: ubiquity/trunk/fuentes/debian/patches/llx_extra_packages.patch @ 7086

Last change on this file since 7086 was 7086, checked in by hectorgh, 2 years ago

fixing patch... ?

File size: 1.2 KB
  • scripts/plugininstall.py

    diff -uNar ubiquity.orig/scripts/install.py ubiquity.mod/scripts/install.py
    old new  
    115115                for line in langpacks:
    116116                    self.langpacks.append(line.strip())
    117117
     118        # Lliurex Packages
     119        self.lliurex_pkgs = []
     120        if os.path.exists('/var/lib/ubiquity/lliurex-extra-packages'):
     121            with open('/var/lib/ubiquity/lliurex-extra-packages') as llx_pkg:
     122                for line in llx_pkg:
     123                    self.lliurex_pkgs.append(line.strip())
     124
    118125        # Load plugins
    119126        modules = plugin_manager.load_plugins()
    120127        modules = plugin_manager.order_plugins(modules)
     
    213220        except install_misc.InstallStepError:
    214221            pass
    215222        except IOError:
     223            pass
     224        except SystemError:
     225            pass
     226
     227        # Ignore failures from lliurex packages installation.
     228        try:
     229            self.do_install(self.lliurex_pkgs)
     230        except install_misc.InstallStepError:
     231            pass
     232        except IOError:
    216233            pass
    217234        except SystemError:
    218235            pass
Note: See TracBrowser for help on using the repository browser.