diff options
author | Aravinda VK <avishwan@redhat.com> | 2016-07-15 13:15:21 +0530 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-08-04 02:40:44 -0700 |
commit | 15e83bedbef360fea0ff67eab4ac8a8a8dd17772 (patch) | |
tree | 520a9f17a364317ca387c94bcd8065990ea51277 | |
parent | 2ea73c9982a30dd9a64f35c0bd19563ce5709175 (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.
> Reviewed-on: http://review.gluster.org/14928
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Kotresh HR <khiremat@redhat.com>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Change-Id: I9155378aa72eb8559ba8af76d91a4985f69f38f9
BUG: 1363598
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reviewed-on: http://review.gluster.org/15075
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r-- | glusterfs.spec.in | 5 | ||||
-rw-r--r-- | tools/glusterfind/Makefile.am | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 1943411d64d..d7e4a049609 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1136,7 +1136,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 + %{_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 @@ -1184,6 +1184,9 @@ exit 0 %endif %changelog +* Fri Jul 15 2016 Aravinda VK <avishwan@redhat.com> +- Removed ".py" extension from symlink(S57glusterfind-delete-post)(#1363598) + * Fri May 6 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com> - additional dirs and files in /var/lib/glusterd/... (#1333900) 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 |