summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--func.spec9
-rw-r--r--setup.py4
2 files changed, 11 insertions, 2 deletions
diff --git a/func.spec b/func.spec
index 3963943..4547129 100644
--- a/func.spec
+++ b/func.spec
@@ -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.
diff --git a/setup.py b/setup.py
index 341d9b7..020cc39 100644
--- a/setup.py
+++ b/setup.py
@@ -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"]),