Skip to content

Commit

Permalink
replace shebang => null line in __init__.py.
Browse files Browse the repository at this point in the history
The __init__.py is not executable.
But it has a shebang.  So rpmlint is warning.
So Fedora executes "sed -i -e 1d" in etcleeper.spec.
http://pkgs.fedoraproject.org/cgit/etckeeper.git/tree/etckeeper.spec
Upstream should not worry downstreams.
Please see also:
https://github.com/joeyh/etckeeper/pull/15

	modified:   Makefile
	modified:   etckeeper-bzr/__init__.py
  • Loading branch information
Mitsutoshi NAKANO committed Jul 16, 2014
1 parent 67e0a71 commit bac4510
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ CP=cp -R
INSTALL=install
INSTALL_EXE=${INSTALL}
INSTALL_DATA=${INSTALL} -m 0644
PYTHON=python

build: etckeeper.spec
-./etckeeper-bzr/__init__.py build || echo "** bzr support not built"
-$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built"

install:
mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/
Expand Down Expand Up @@ -47,7 +48,7 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
endif
-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
echo "** installation successful"

clean: etckeeper.spec
Expand Down
2 changes: 1 addition & 1 deletion etckeeper-bzr/__init__.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#
# Bazaar plugin that runs etckeeper pre-commit when necessary

"""Runs etckeeper pre-commit when necessary."""
Expand Down

0 comments on commit bac4510

Please sign in to comment.