From b9d3f8f9735366a2ceaae00bee2875cf765d0688 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 27 Feb 2018 15:38:55 -0800 Subject: [PATCH] Add a logging patch to investigate compose failures (releng #7355) --- ...more-around-disk-image-file-creation.patch | 30 +++++++++++++++++++ lorax.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Log-a-bit-more-around-disk-image-file-creation.patch diff --git a/0001-Log-a-bit-more-around-disk-image-file-creation.patch b/0001-Log-a-bit-more-around-disk-image-file-creation.patch new file mode 100644 index 0000000..47f350d --- /dev/null +++ b/0001-Log-a-bit-more-around-disk-image-file-creation.patch @@ -0,0 +1,30 @@ +From 4b16d267f20555cdc45df36ee6eb2fa737bfc587 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 27 Feb 2018 15:19:44 -0800 +Subject: [PATCH] Log a bit more around disk image file creation + +Signed-off-by: Adam Williamson +--- + src/pylorax/imgutils.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pylorax/imgutils.py b/src/pylorax/imgutils.py +index af53490..d1d7f84 100644 +--- a/src/pylorax/imgutils.py ++++ b/src/pylorax/imgutils.py +@@ -324,8 +324,12 @@ class LoopDev(object): + def __init__(self, filename, size=None): + self.loopdev = None + self.filename = filename ++ exists = os.path.exists(filename) ++ logger.debug("LoopDev before mksparse: filename %s, exists %s, size %s", filename, exists, size) + if size: + mksparse(self.filename, size) ++ exists = os.path.exists(filename) ++ logger.debug("LoopDev after mksparse: filename %s, exists %s, size %s", filename, exists, size) + def __enter__(self): + self.loopdev = loop_attach(self.filename) + return self.loopdev +-- +2.16.1 + diff --git a/lorax.spec b/lorax.spec index 23a7db4..2fc4997 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 28.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -15,6 +15,8 @@ URL: https://github.com/rhinstaller/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Add some logging to try and investigate https://pagure.io/releng/issue/7355 +Patch0: 0001-Log-a-bit-more-around-disk-image-file-creation.patch BuildRequires: python3-devel @@ -121,6 +123,7 @@ Lorax templates for creating the boot.iso and live isos are placed in %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build @@ -155,6 +158,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Tue Feb 27 2018 Adam Williamson - 28.8-2 +- Add a logging patch to investigate compose failures (releng #7355) + * Mon Feb 26 2018 Brian C. Lane 28.8-1 - cleanup: don't remove libgstgl (dusty@dustymabe.com)