diff options
| author | Aravinda VK <avishwan@redhat.com> | 2016-07-15 13:15:21 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-07-15 06:41:16 -0700 |
| commit | db4f4f1500372ee9f5a1c8faff5081d2a95652e3 (patch) | |
| tree | a2d786dfb9759251ba53e41860cd3a20ce8ae9c5 | |
| parent | ab56ec1e99cd76d45b52d841e6b0009f94a3268b (diff) | |
packaging: Remove ".py" extension from symlink target
S57glusterfind-delete-post.py* is packaged in
$LIBEXEC/glusterfs/glusterfind directory, symlink created to
/var/lib/glusterd/hooks directory
ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \
$(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py
".py" should be removed from symlink target so that build system will
not try to compile the symlink files and generate .pyc/.pyo files.
BUG: 1356868
Change-Id: I9155378aa72eb8559ba8af76d91a4985f69f38f9
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/14928
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 9 | ||||
| -rw-r--r-- | tools/glusterfind/Makefile.am | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 155d8f7f73f..6a29895a093 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1145,11 +1145,7 @@ exit 0 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/pre %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post - %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py -%if ( 0%{?rhel} && 0%{?rhel} > 6 ) -%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyc -%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyo -%endif + %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post @@ -1200,6 +1196,9 @@ exit 0 %{_sbindir}/gf_recon %changelog +* Fri Jul 15 2016 Aravinda VK <avishwan@redhat.com> +- Removed ".py" extension from symlink(S57glusterfind-delete-post)(#1356868) + * Thu Jul 14 2016 Aravinda VK <avishwan@redhat.com> - Removed extra packaging line of cliutils(python-gluster)(#1342356) diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am index 17ff915834f..37f23bed1bb 100644 --- a/tools/glusterfind/Makefile.am +++ b/tools/glusterfind/Makefile.am @@ -10,11 +10,11 @@ deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py uninstall-local: - rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py + rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post install-data-local: $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ - rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py + rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ - $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py + $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post |