Update the URL in lorax.spec to point to new Lorax location

Moved to https://github.com/weldr/lorax (cherry picked from commit 1cf2d8fe6f)
Automatic commit of package [lorax] release [26.9-1].
2018-03-19 13:46:02 -07:00 · 2017-07-10 11:52:53 -07:00 · 2017-07-10 11:37:25 -07:00 · 2017-05-30 11:05:53 -07:00 · 2017-05-30 11:05:14 -07:00
4 changed files with 26 additions and 6 deletions
--- a/lorax.spec
+++ b/lorax.spec
@ -3,15 +3,15 @@
 %define debug_package %{nil}

 Name:           lorax
-Version:        26.7
+Version:        26.9
 Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images

 Group:          Applications/System
 License:        GPLv2+
-URL:            https://github.com/rhinstaller/lorax
+URL:            https://github.com/weldr/lorax
 # To generate Source0 do:
-# git clone https://github.com/rhinstaller/lorax
+# git clone https://github.com/weldr/lorax
 # git checkout -b archive-branch lorax-%%{version}-%%{release}
 # tito build --tgz
 Source0:        %{name}-%{version}.tar.gz
@ -152,6 +152,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install


 %changelog
+* Mon Jul 10 2017 Brian C. Lane <bcl@redhat.com> 26.9-1
+- runtime-cleanup.tmpl: don't delete localedef (jlebon@redhat.com)
+
+* Tue May 30 2017 Brian C. Lane <bcl@redhat.com> 26.8-1
+- Try all packages when installpkg --optional is used. (#1440417)
+
 * Mon Mar 06 2017 Brian C. Lane <bcl@redhat.com> 26.7-1
 - add ostree to get installed in anaconda environment (dusty@dustymabe.com)
 - Add dependency for lvmdump -l command (#1255659) (jkonecny@redhat.com)
--- a/rel-eng/packages/lorax
+++ b/rel-eng/packages/lorax
@ -1 +1 @@
-26.7-1 ./
+26.9-1 ./
--- a/share/templates.d/99-generic/runtime-cleanup.tmpl
+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl
@ -199,7 +199,8 @@ removefrom glibc /usr/libexec/* /usr/sbin/*
 removefrom glibc-common /etc/* /usr/bin/catchsegv /usr/bin/gencat
 removefrom glibc-common /usr/bin/getent
 removefrom glibc-common /usr/bin/locale /usr/bin/rpcgen /usr/bin/sprof
-removefrom glibc-common /usr/bin/tzselect /usr/bin/localedef
+# NB: we keep /usr/bin/localedef so anaconda can inspect payload locale info
+removefrom glibc-common /usr/bin/tzselect
 removefrom glibc-common /usr/libexec/* /usr/sbin/*
 removefrom gmp /usr/${libdir}/libgmpxx.* /usr/${libdir}/libmp.*
 removefrom gnome-bluetooth-libs /usr/${libdir}/libgnome-bluetooth*
--- a/src/pylorax/ltmpl.py
+++ b/src/pylorax/ltmpl.py
@ -570,8 +570,21 @@ class LoraxTemplateRunner(object):
                for exclude in excludes:
                    pkgnames = {pkgname for pkgname in pkgnames if not fnmatch.fnmatch(pkgname, exclude)}

+                # Sort the results so that we have consistent results
+                pkgnames = sorted(pkgnames)
+
+                # If the request is a glob, expand it in the log
+                if any(g for g in ['*','?','.'] if g in p):
+                    logger.info("installpkg: %s expands to %s", p, ",".join(pkgnames))
+
                for pkgname in pkgnames:
-                    self.dbo.install(pkgname)
+                    try:
+                        self.dbo.install(pkgname)
+                    except Exception as e: # pylint: disable=broad-except
+                        if required:
+                            raise
+                        # Not required, log it and continue processing pkgs
+                        logger.error("installpkg %s failed: %s", pkgname, str(e))
            except Exception as e: # pylint: disable=broad-except
                logger.error("installpkg %s failed: %s", p, str(e))
                errors = True
Author	SHA1	Message	Date
Brian C. Lane	b762a8ce1d	Update the URL in lorax.spec to point to new Lorax location Moved to https://github.com/weldr/lorax (cherry picked from commit `1cf2d8fe6f`)	2018-03-19 13:46:02 -07:00
Brian C. Lane	564acd117f	Automatic commit of package [lorax] release [26.9-1]. Created by command: /usr/bin/tito tag	2017-07-10 11:52:53 -07:00
Jonathan Lebon	54fe93b426	runtime-cleanup.tmpl: don't delete localedef This is required in the future for anaconda to be able to inspect the supported locales in Atomic Host installations. This is the same patch as https://github.com/rhinstaller/lorax/pull/194 but for the master branch. (cherry picked from commit `698d8c5109`)	2017-07-10 11:37:25 -07:00
Brian C. Lane	f634ed6d12	Automatic commit of package [lorax] release [26.8-1]. Created by command: /usr/bin/tito tag	2017-05-30 11:05:53 -07:00
Brian C. Lane	bf5afd483d	Try all packages when installpkg --optional is used. Also sort the expanded list of packages so that any failures will be consistent instead of depending on the randomness of a set(). And add better logging when things fail. The core issue is that repodata may have packages that match globs, but they cannot actually be installed (eg. sigrok-firmware). This can cause some of the globbed packages to be installed before hitting the failure package. With this change it will log the expanded list of packages if a glob is used. It will skip any packages that fail to install when using --optional with the glob, and continue to install the rest. Related: rhbz#1440417 (cherry picked from commit `1c6b083260`)	2017-05-30 11:05:14 -07:00
 @ -1 +1 @@
 .7-1 ./
 .9-1 ./