diff --git a/rbm-d50b2a6-Fix-exit_error-call.patch b/rbm-d50b2a6-Fix-exit_error-call.patch new file mode 100644 index 0000000..b9a65dc --- /dev/null +++ b/rbm-d50b2a6-Fix-exit_error-call.patch @@ -0,0 +1,29 @@ +From 3e85f359e84222aa450ffbd1e82d671462814e6c Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier +Date: Mon, 24 Oct 2016 18:49:58 +0200 +Subject: [PATCH] Fix exit_error call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + lib/RBM/DefaultConfig.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm +index 15f52f1..17c774b 100644 +--- a/lib/RBM/DefaultConfig.pm ++++ b/lib/RBM/DefaultConfig.pm +@@ -41,7 +41,7 @@ sub lsb_release { + my $res = {}; + my ($stdout, $stderr, $success, $exit_code) + = capture_exec('lsb_release', '-irc'); +- exit_error("Unknown distribution") unless $success; ++ RBM::exit_error("Unknown distribution") unless $success; + foreach (split "\n", $stdout) { + $res->{id} = $1 if (m/^Distributor ID:\s+(.+)$/); + $res->{release} = $1 if (m/^Release:\s+(.+)$/); +-- +2.7.4 + diff --git a/rbm.spec b/rbm.spec index 816aa86..1ea18e3 100644 --- a/rbm.spec +++ b/rbm.spec @@ -14,6 +14,9 @@ Source0: https://github.com/boklm/%{name}/archive/%{commit0}.tar.gz#/%{name}- # Create a home directory for default user in a Docker container, # in upstream after d50b2a6. Patch0: rbm-d50b2a6-Create-home-directory-when-adding-default-user-in-do.patch +# Fix error reporting while parsing LSB release string, +# in upstream after d50b2a6. +Patch1: rbm-d50b2a6-Fix-exit_error-call.patch BuildArch: noarch BuildRequires: asciidoc BuildRequires: coreutils @@ -61,6 +64,7 @@ allow reproducing the build. %prep %setup -qn %{name}-%{commit0} %patch0 -p1 +%patch1 -p1 %build make sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ @@ -81,6 +85,7 @@ make sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ %changelog * Fri Nov 04 2016 Petr Pisar - 0.4-3.20151206gitd50b2a6 - Create a home directory for default user in a Docker container +- Fix error reporting while parsing LSB release string * Thu Feb 04 2016 Fedora Release Engineering - 0.4-2.20151206gitd50b2a6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild