diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-16 18:23:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-16 18:23:23 -0400 |
| commit | a6ac74e3b7d9c432101c7577e9a9bc88ce0fced2 (patch) | |
| tree | 492bbcda3ba8b8f94009c2823cfdc7944ba68af3 | |
| parent | a01c39701855bc6f340260bec766215faddf4c8d (diff) | |
| parent | bac4510d640ab4550604564ef700a7e0f9bee11f (diff) | |
Merge branch 'rpmlintBzr' of https://github.com/MItsutoshiNAKANO/etckeeper
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | etckeeper-bzr/__init__.py | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -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.""" |