rpm: Improve logging in case of rpmlib error

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index a8d12e00d4542562969a63da97534babe7337501..ee0fb02acee4217f7ce2cbfb8888be6b43856a8b 100644 (file)
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -35,7 +35,7 @@ import gbp.log
 from gbp.pkg import (UpstreamSource, compressor_opts, parse_archive_filename)
 from gbp.rpm.policy import RpmPkgPolicy
 from gbp.rpm.linkedlist import LinkedList
-from gbp.rpm.lib_rpm import librpm
+from gbp.rpm.lib_rpm import librpm, get_librpm_log
 
 
 class NoSpecError(Exception):
@@ -174,8 +174,11 @@ class SpecFile(object):
                 librpm.spec(filtered.name)
                 return librpm.spec(filtered.name)
             except ValueError as err:
-                raise GbpError("RPM error while parsing %s: %s" %
-                                (self.specfile, err))
+                rpmlog = get_librpm_log()
+                gbp.log.debug("librpm log:\n        %s" %
+                                "\n        ".join(rpmlog))
+                raise GbpError("RPM error while parsing %s: %s (%s)" %
+                                (self.specfile, err, rpmlog[-1]))
 
     def _get_version(self):
         """

diff --git a/gbp/rpm/lib_rpm.py b/gbp/rpm/lib_rpm.py
index adf40d1b06e29872ce6d0fc626dd4d93c8070c83..4bad44e70679cfa281c9cd3cc3eda58d81512415 100644 (file)
--- a/gbp/rpm/lib_rpm.py
+++ b/gbp/rpm/lib_rpm.py
@@ -37,7 +37,7 @@ librpm.setVerbosity(librpm.RPMLOG_INFO)
 librpm.setLogFile(_rpmlogfd)
 
 
-def get_log(truncate=True):
+def get_librpm_log(truncate=True):
     """Get rpmlib log output"""
     _rpmlogfd.seek(0)
     log = [line.strip() for line in _rpmlogfd.readlines()]