summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>2014-07-16 12:55:13 +0900
committerMitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>2014-07-16 12:55:13 +0900
commitbac4510d640ab4550604564ef700a7e0f9bee11f (patch)
treef9caadc53bb24e0ce4659b17989924967d13af91
parent67e0a712db9dfa1f5c9427d9db3abef9302e4be6 (diff)
replace shebang => null line in __init__.py.
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
-rw-r--r--Makefile5
-rw-r--r--[-rwxr-xr-x]etckeeper-bzr/__init__.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cf034a2..1ba3ac1 100644
--- a/Makefile
+++ b/Makefile
@@ -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/
@@ -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
diff --git a/etckeeper-bzr/__init__.py b/etckeeper-bzr/__init__.py
index 61322fe..3fa87d1 100755..100644
--- a/etckeeper-bzr/__init__.py
+++ b/etckeeper-bzr/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
# Bazaar plugin that runs etckeeper pre-commit when necessary
"""Runs etckeeper pre-commit when necessary."""