← Back to branch summary

~canonical-ci-engineering/ubuntu-ci-services-itself/ansible

« back to all changes in this revision

Viewing changes to lib/ansible/runner/lookup_plugins/env.py

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, Harlan Lieberman-Berg, Michael Vogt
  • Date: 2013-11-01 09:40:59 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20131101094059-6w580ocxzqyqzuu3
Tags: 1.3.4+dfsg-1
http://bugs.debian.org/717777
http://bugs.debian.org/714822
http://bugs.debian.org/721766
[ Harlan Lieberman-Berg ]
* New upstream release (Closes: #717777).
  Fixes CVE-2013-2233 (Closes: #714822).
  Fixes CVE-2013-4259 (Closes: #721766).
* Drop fix-ansible-cfg patch.
* Change docsite generation to not expect docs as part of a wordpress install.
* Add trivial patch to fix lintian error with rpm-key script.
* Add patch header information to fix-html-makefile.

[ Michael Vogt ]
* add myself to uploader
* build/ship the module manpages for ansible in the ansible package

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ansible/runner/lookup_plugins/env.py
23
23
    def __init__(self, basedir=None, **kwargs):
24
24
        self.basedir = basedir
25
25
 
26
 
    def run(self, terms, **kwargs):
 
26
    def run(self, terms, inject=None, **kwargs):
 
27
 
 
28
        terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) 
 
29
 
27
30
        if isinstance(terms, basestring):
28
31
            terms = [ terms ]
 
32
 
29
33
        ret = []
30
34
        for term in terms:
31
35
            var = term.split()[0]