diff options
| -rw-r--r-- | func.spec | 9 | ||||
| -rw-r--r-- | setup.py | 4 | ||||
| -rwxr-xr-x | test/test-it.sh | 18 |
3 files changed, 27 insertions, 4 deletions
@@ -74,6 +74,12 @@ rm -fr $RPM_BUILD_ROOT %{python_sitelib}/func/*.py* %dir %{python_sitelib}/func/minion/modules %{python_sitelib}/func/minion/modules/*.py* + +# we need to make the spec and setup.py find modules +# in deep dirs automagically +%{python_sitelib}/func/minion/modules/*/*.py* +%{python_sitelib}/func/minion/modules/*/*/*.py* + %dir /var/log/func %dir /var/lib/func %dir /var/lib/func/certmaster @@ -125,6 +131,9 @@ fi %changelog +* Mon Feb 4 2008 Adrian Likins <alikins@redhat.com> - 0.0.15-1 +- catch some deeper minion modules as well + * Sun Jan 13 2008 Steve 'Ashcrow' Milner <smilner@redhat.como> - 0.0.14-6 - Added in func-create-module for scripts. @@ -46,8 +46,8 @@ if __name__ == "__main__": # FIXME if there's a clean/easy way to recursively # find modules then by all means do it, for now # this will work. - "%s/minion/modules/netapp" % NAME, - "%s/minion/modules/netapp/vol" % NAME + "%s/minion/modules.netapp" % NAME, + "%s/minion/modules.netapp.vol" % NAME ], data_files = [(initpath, ["init-scripts/funcd"]), (initpath, ["init-scripts/certmaster"]), diff --git a/test/test-it.sh b/test/test-it.sh index d700a41..961bb3b 100755 --- a/test/test-it.sh +++ b/test/test-it.sh @@ -78,6 +78,16 @@ check_out_code() } +copy_code_to_buildroot() +{ + + msg "Copying current build dir to $BUILD_PATH" + rm -rf $BUILD_PATH + mkdir -p $BUILD_PATH/func/ + cp -var ../* $BUILD_PATH/func + +} + build_rpm() { @@ -90,7 +100,9 @@ build_rpm() echo "Building $PKG in $BRT" echo "======================================" echo + echo $BUILD_PATH/$PKG pushd $BUILD_PATH/$PKG + echo "BRT" $BRT "PKK" $PKG make clean make rpms if [ $? != 0 ]; then @@ -253,8 +265,10 @@ if [ "$BUILD" == "Y" ] ; then if [ "$BUILD_FROM_FRESH_CHECKOUT" == "Y" ] ; then check_out_code else - # assume we are running from the test dir - BUILD_PATH="`pwd`/../" + # assume we want to build a copy of the current + # source tree, we copy it else where and build + # so we dont 'splode any thing with the build process + copy_code_to_buildroot fi |