diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2015-05-06 12:54:19 -0400 |
|---|---|---|
| committer | Raghavendra Bhat <raghavendra@redhat.com> | 2015-05-19 06:00:23 -0700 |
| commit | 9c83720569709b00c1c64234a3febeabb414d1cd (patch) | |
| tree | 2235cea65817b8ef5c659c739015df351b821f79 | |
| parent | c5a76aa8e63eb614a4e77e98f4e1ce6efe467d6d (diff) | |
features/glupy: fix file locations
Something about the reconfiguration of our test machines to accommodate
packaging changes in master had the side effect of breaking 3.6
regression tests. This patch, based on 10616 in master, brings the 3.6
paths in line with master, so if everything's installed correctly for
master than it will work for 3.6 as well.
Change-Id: Icc64a32b6c7e95ff84235be7bef5914c69dae8d0
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/10617
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | glusterfs.spec.in | 2 | ||||
| -rw-r--r-- | xlators/features/glupy/src/Makefile.am | 7 | ||||
| -rw-r--r-- | xlators/features/glupy/src/glupy/Makefile.am | 5 | ||||
| -rw-r--r-- | xlators/features/glupy/src/glupy/__init__.py (renamed from xlators/features/glupy/src/glupy.py) | 0 |
5 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e5bdcc59d3a..b3c7b5a8b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ AC_CONFIG_FILES([Makefile xlators/features/glupy/src/Makefile xlators/features/glupy/src/setup.py xlators/features/glupy/src/__init__.py + xlators/features/glupy/src/glupy/Makefile xlators/features/locks/Makefile xlators/features/locks/src/Makefile xlators/features/quota/Makefile diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 7130a5ca4ce..28aa0b70506 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -901,7 +901,7 @@ fi # Glupy C shared library %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so # Glupy Python files -%{python_sitelib}/gluster/glupy.* +%{python_sitelib}/gluster/glupy/__init__.* # Don't expect a .egg-info file on EL5 %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) %{python_sitelib}/glusterfs_glupy*.egg-info diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index 697f0c7e443..2ac0d99cd5f 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -14,8 +14,11 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ noinst_HEADERS = glupy.h -# Install glupy.py into the Python site-packages area +# Install __init__.py into the Python site-packages area pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster -pyglupy_PYTHON = glupy.py __init__.py +pyglupy_PYTHON = __init__.py + +# Install glupy/__init_-.py into the Python site-packages area +SUBDIRS = glupy CLEANFILES = diff --git a/xlators/features/glupy/src/glupy/Makefile.am b/xlators/features/glupy/src/glupy/Makefile.am new file mode 100644 index 00000000000..573d2da12e1 --- /dev/null +++ b/xlators/features/glupy/src/glupy/Makefile.am @@ -0,0 +1,5 @@ +# Install __init__.py into the Python site-packages area +pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy +pyglupy_PYTHON = __init__.py + +CLEANFILES = diff --git a/xlators/features/glupy/src/glupy.py b/xlators/features/glupy/src/glupy/__init__.py index b9fc3700fa6..b9fc3700fa6 100644 --- a/xlators/features/glupy/src/glupy.py +++ b/xlators/features/glupy/src/glupy/__init__.py |