Author: glen Date: Mon Jul 14 16:35:39 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- hide errors from missing python binary
---- Files affected:
SOURCES:
rpm.macros (1.467 -> 1.468)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.467 SOURCES/rpm.macros:1.468
--- SOURCES/rpm.macros:1.467 Tue Jul 1 13:43:32 2008
+++ SOURCES/rpm.macros Mon Jul 14 18:35:34 2008
@@ -723,10 +723,10 @@
# Python specific macro definitions.
# python main version
-%py_ver %{expand:%%global py_ver %(%{__python} -c
"import sys; print sys.version[:3]" || echo ERROR)}%py_ver
+%py_ver %{expand:%%global py_ver %(%{__python} -c
"import sys; print sys.version[:3]" 2>/dev/null || echo ERROR)}%py_ver
# directories
-%py_prefix %{expand:%%global py_prefix %(%{__python} -c "import
sys; print sys.prefix" || echo ERROR)}%py_prefix
+%py_prefix %{expand:%%global py_prefix %(%{__python} -c "import
sys; print sys.prefix" 2>/dev/null || echo ERROR)}%py_prefix
%py_libdir %{py_prefix}/%{_lib}/python%{py_ver}
%py_scriptdir %{py_prefix}/share/python%{py_ver}
%py_incdir /usr/include/python%{py_ver}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.467&r2=1.468&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
