shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

spec: Fix 04ab1fa572: Remove left-overs

Browse Source
This commit is contained in:
Marian Csontos 2016-02-22 17:40:12 +01:00
parent c716813651
commit 367fb85e44
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spec/build.inc
View File

@ -55,11 +55,6 @@ make install_initscripts DESTDIR=$RPM_BUILD_ROOT
%if %{enable_testsuite} %if %{enable_testsuite}
make -C test install DESTDIR=$RPM_BUILD_ROOT make -C test install DESTDIR=$RPM_BUILD_ROOT
%endif %endif
%if %{enable_python3}
pushd %{py3dir}
make -C python install DESTDIR=$RPM_BUILD_ROOT
popd
%endif
# when building an src.rpm from freestanding specfiles # when building an src.rpm from freestanding specfiles
test -e %{_sourcedir}/source.inc || cp source.inc build.inc packages.inc macros.inc %{_sourcedir} test -e %{_sourcedir}/source.inc || cp source.inc build.inc packages.inc macros.inc %{_sourcedir}

14
test/api/pytest.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# Copyright (C) 2012-2015 Red Hat, Inc. All rights reserved. # Copyright (C) 2012-2015 Red Hat, Inc. All rights reserved.
# #
# This file is part of LVM2. # This file is part of LVM2.
@ -31,9 +31,17 @@ aux prepare_dmeventd
#Locate the python binding library to use. #Locate the python binding library to use.
if [[ -n $abs_top_builddir ]]; then if [[ -n $abs_top_builddir ]]; then
python_lib=$(find $abs_top_builddir -name lvm.so) python_lib=($(find $abs_top_builddir -name lvm.so))
if [[ ${#python_lib[*]} -ne 1 ]]; then
if [[ ${#python_lib[*]} -gt 1 ]]; then
# Unable to test python bindings if multiple libraries found:
echo "Found left over lvm.so: ${python_lib[*]}"
false
else
# Unable to test python bindings if library not available # Unable to test python bindings if library not available
test -n "$python_lib" || skip "lvm2-python-libs not built" skip "lvm2-python-libs not built"
fi
fi
export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH
elif rpm -q lvm2-python-libs &>/dev/null; then elif rpm -q lvm2-python-libs &>/dev/null; then