From 9d0f2a6e9b9fa2007fdb0e91c9f6e353908309de Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 21 Apr 2012 12:01:15 -0400 Subject: [PATCH] Unused import --- Makefile | 25 +++++++++++++++++++++++-- lib/ansible/playbook.py | 1 - 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 72e9608df4d..7d910160fd1 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,34 @@ #!/usr/bin/make +######################################################## +# Makefile for Ansible +# +# useful targets: +# make sdist ---------------- produce a tarball +# make rpm ----------------- produce RPMs +# make debian --------------- produce a dpkg (FIXME?) +# make docs ----------------- rebuild the manpages (results are checked in) +# make tests ---------------- run the tests +# make pyflakes, make pep8 -- source code checks + +######################################################## +# variable section + NAME = "ansible" + +# Manpages are currently built with asciidoc -- would like to move to markdown # This doesn't evaluate until it's called. The -D argument is the # directory of the target file ($@), kinda like `dirname`. ASCII2MAN = a2x -D $(dir $@) -d manpage -f manpage $< ASCII2HTMLMAN = a2x -D docs/html/man/ -d manpage -f xhtml -# Space separated list of all the manpages we want to end up with. MANPAGES := docs/man/man1/ansible.1 docs/man/man1/ansible-playbook.1 + SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + +# VERSION file provides one place to update the software version VERSION := $(shell cat VERSION) -# These are for building the RPM. + +# RPM build parameters RPMSPECDIR= packaging/rpm RPMSPEC = $(RPMSPECDIR)/ansible.spec RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1) @@ -17,6 +36,8 @@ RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" RPMDIST = $(shell rpm --eval '%dist') RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)" +######################################################## + all: clean python tests: diff --git a/lib/ansible/playbook.py b/lib/ansible/playbook.py index 791d3811784..ccb87291e07 100755 --- a/lib/ansible/playbook.py +++ b/lib/ansible/playbook.py @@ -22,7 +22,6 @@ import ansible.runner import ansible.constants as C from ansible import utils from ansible import errors -import shlex import os import time