From 56bb73b03e8eaca8893235b17f10e58e849f6828 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 05 2021 21:08:50 +0000
Subject: import scl-utils-2.0.2-14.el8


---

diff --git a/SOURCES/BZ-1867135-print-scl_source-errors-to-stderr.patch b/SOURCES/BZ-1867135-print-scl_source-errors-to-stderr.patch
new file mode 100644
index 0000000..564e5c1
--- /dev/null
+++ b/SOURCES/BZ-1867135-print-scl_source-errors-to-stderr.patch
@@ -0,0 +1,30 @@
+commit 835ffbb5753036c4b58626869a4f0f5b30945707
+Author: Michal Domonkos <mdomonko@redhat.com>
+Date:   Tue Jul 13 17:01:07 2021 +0200
+
+    Print scl_source errors to stderr
+    
+    Resolves: rhbz#1867135
+
+diff --git a/shell/scl_source b/shell/scl_source
+index 30b8baf..c810cb9 100755
+--- a/shell/scl_source
++++ b/shell/scl_source
+@@ -34,7 +34,7 @@ for arg in "$@"; do
+     _scl_prefix_file=$_scl_dir/$arg
+     _scl_prefix=`cat $_scl_prefix_file 2> /dev/null`
+     if [ $? -ne 0 ]; then
+-        echo "Can't read $_scl_prefix_file, $arg is probably not installed."
++        echo >&2 "Can't read $_scl_prefix_file, $arg is probably not installed."
+         return 1
+     fi
+   
+@@ -60,7 +60,7 @@ if [ $_recursion == "false" ]; then
+         _scl_scriptlet_path="${_scl_prefixes[$_i]}/${_scls[$_i]}/${_scl_scriptlet_name}"
+         source "$_scl_scriptlet_path"
+         if [ $? -ne 0 ]; then
+-            echo "Can't source $_scl_scriptlet_name, skipping."
++            echo >&2 "Can't source $_scl_scriptlet_name, skipping."
+         else
+             export X_SCLS="${_scls[$_i]} $X_SCLS"
+         fi;
diff --git a/SPECS/scl-utils.spec b/SPECS/scl-utils.spec
index 81b8ed9..e455dc4 100644
--- a/SPECS/scl-utils.spec
+++ b/SPECS/scl-utils.spec
@@ -3,7 +3,7 @@
 Name:       scl-utils
 Epoch:      1
 Version:    2.0.2
-Release:    13%{?dist}
+Release:    14%{?dist}
 Summary:    Utilities for alternative packaging
 
 License:    GPLv2+
@@ -20,6 +20,7 @@ Patch1:     0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch
 Patch2:     0004-define-macro-python-explicitly.patch
 Patch3:     BZ-1618803-adapt-env-parser-to-new-module-output.patch
 Patch4:     BZ-1927971-let-scl_source-behave-with-errexit.patch
+Patch5:     BZ-1867135-print-scl_source-errors-to-stderr.patch
 
 %description
 Run-time utility for alternative packaging.
@@ -82,6 +83,9 @@ ln -s prefixes conf
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Tue Jul 13 2021 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.2-14
+- Print scl_source errors to stderr (#1867135)
+
 * Tue Feb 16 2021 Michal Domonkos <mdomonko@redhat.com> - 1:2.0.2-13
 - Let scl_source behave when -e/errexit is set (#1927971, James E. Flemer)