Commit Graph

3444 Commits (5f8d63dd5788e0efa77192775c188ff46359b646)

Author SHA1 Message Date
Grzegorz Nosek 7f33580eba Fix exponential regex performance issue
filter_leading_non_json_lines effectively does

re.match(".*\w+=\w+.*", line)

for every line of output. This has abysmal performance in case of large
Base64-encoded data (which ultimately does not match the regex but does
match the .*\w+= part) as returned e.g. by the template module (diffs).

Replacing the match with

re.search("\w=\w", line)

drops the complexity back to linear, and actually usable with large
diffs from the template module (a 150 KB Base64 diff kept Ansible
spinning at 100% cpu for minutes).

Also, check the easy cases (line.startswith) first while we're here.

Closes: #8932
10 years ago
James Cammarata 9c1a89ff4e Merge branch 'patch-1' of https://github.com/debfx/ansible into debfx-patch-1 10 years ago
Marc Abramowitz 44b9f5e752 Make `pip install -e` work
This allows `pip install -e` and `python setup.py develop` to work
without having to do the stuff in
http://docs.ansible.com/intro_installation.html#running-from-source so
it's a tad nicer for Python programmers who are accustomed to installing
packages as editable/in development mode.

Fixes GH-8355 (https://github.com/ansible/ansible/issues/8355)
10 years ago
James Cammarata 7a5076c8b8 Catching shlex splitting error in fact gathering get_cmdline call
Fixes #8352
10 years ago
James Cammarata 80df2135e9 Fix parsing of tasks with variable module names
Also adding an integration test for same.
10 years ago
James Cammarata 189824dd76 Remove whitespace around args
Fixes #8343
10 years ago
James Cammarata e6fa50a306 Move splitter to module_utils so modules can use it and fix command arg splitting
Fixes #8338
10 years ago
Veeti Paananen 5780f3a8b4 Expand variables in configuration files, take two
e.g. $HOME.
10 years ago
Veeti Paananen e6bd049892 Don't expand remote_tmp path locally 10 years ago
James Cammarata a9f0f8e975 Revert "template.py: Handle purposely raised exceptions in lookup()"
This reverts commit 2fda9bc743.
10 years ago
James Cammarata aee940aaca Reworking _clean_data() to be smarter about replaces
Fixes #8228
10 years ago
James Cammarata 6e814566de Unquote params passed to an include statement
Fixes #8315
10 years ago
Michael DeHaan 106f4ccc01 Revert "Expand variables in configuration files" - I feel I've been here before.
Breaks some test runs.

This reverts commit a9eef029b6.
10 years ago
Michael DeHaan 97fa9502aa Merge pull request #8309 from veeti/cfg-vars
Expand variables in configuration files
10 years ago
Michael DeHaan 645ab7baff Merge pull request #7950 from mesk41in/devel
Fix unsupported regexp parameter in assemble
10 years ago
Michael DeHaan fb60e767a7 Taking alternate approach.
Revert "Fix hostname when get_distribution_version() returns a string."

This reverts commit 08f97c0b9d.
10 years ago
Michael DeHaan 628d828876 Merge pull request #8087 from neersighted/string_version
Fix hostname when get_distribution_version() returns a string.
10 years ago
Michael DeHaan 30e6a659ae Merge pull request #8171 from jbenden/osx-10.10
Support for OS X 10.10 DP3.
10 years ago
Michael DeHaan 20f65f2c79 Merge pull request #8262 from icoloma/patch-1
Bugfix: bulletproof unexpected_error_msg at gce.py
10 years ago
Veeti Paananen a9eef029b6 Expand variables in configuration files
e.g. $HOME. Fixes #6373.
10 years ago
Nacho Coloma 979824eedc Moved import to the top 10 years ago
James Cammarata 6eac47e519 Use split_args instead of shlex.split for included params
Fixes #8296
10 years ago
James Cammarata 7344baeffa Make sure empty non-quoted tokens are not added to the arg params list 10 years ago
James Cammarata 3714c0742f Split args on single spaces only 10 years ago
James Cammarata 57f89b85eb Merge pull request #8271 from tksmd/fix-copy-set-fs-attributes-issue
fix an issue that copying directory will fail when trying to change file attributes
10 years ago
James Cammarata 63bcbd0af2 Fix for unicode decoding error in new splitting code
Also adds a new unicode integration test
10 years ago
James Cammarata 10a850c70f Merge branch 'new_arg_splitting' into devel 10 years ago
Michael DeHaan 8d42f5cbfa Smush ds removal 10 years ago
James Cammarata b8a4ba26f0 Refactoring split_args into sub-functions 10 years ago
Michael DeHaan 630f080cf0 Start of unit tests for split_args function, moved split_args to utils since not needed by modules (so far). 10 years ago
Michael DeHaan b5d64fdb36 Some notes/comment upgrades on split_args. 10 years ago
James Cammarata 43154e5101 Using custom splitting function for module param counting 10 years ago
Michael DeHaan e143d7dab7 Merge pull request #7543 from yangliping/fix_local_facts_file_checking_portability
Fix portability issue when checking local facts file permission.
11 years ago
Michael DeHaan 635bea645c Merge pull request #7992 from dehylton/devel
fix swap translation on 4.x openbsd with 2.5.4 python
11 years ago
James Cammarata b21875d5a9 Make sure 'item' variable is set when using first_available_file
Fixes #8220
11 years ago
someda 1b1d5d0d3d fix an issue that copying directory will fail when trying to change file attributes and the target file already exists on remote
- the issue was introduced by the commit 84759faa09
11 years ago
James Cammarata 2cc602beea Fixes for module param counting and additional shell quoting issues 11 years ago
Benno Joy ac85d8444b fix for unarchive 8257 11 years ago
Nacho Coloma 57428c48a2 Bugfix: bulletproof unexpected_error_msg at gce.py
This method was still failing for me with a "missing http_code" message. After applying this change, the error message is:

```
msg: Unexpected response: {'value': 'PyCrypto library required for Service Account Authentication.'}
```

I wanted to contribute a rock-solid `unexpected_error_msg` implementation.
11 years ago
James Cammarata 84759faa09 Security fixes:
* Strip lookup calls out of inventory variables and clean unsafe data
  returned from lookup plugins (CVE-2014-4966)
* Make sure vars don't insert extra parameters into module args and prevent
  duplicate params from superseding previous params (CVE-2014-4967)
11 years ago
James Cammarata 00e089e503 Revert "Explicitly set the user option for ssh connections"
This reverts commit 0f91add86f.

Fixes #8216
11 years ago
Joseph Benden da5e32b316 Needs additional divisor. 11 years ago
Michael DeHaan 0fad9575e9 Refine error message about invalid ops since people forget to indent tasks fairly often. 11 years ago
James Cammarata 0e5b0a2e97 Revert "Set Jinja2's keep_trailing_newline=True in template_from_string."
This reverts commit 7a8eb0b670.
11 years ago
Joseph Benden b55791ef43 Support for OS X 10.10 DP3. 11 years ago
James Cammarata 62e9cf63b7 Merge pull request #8170 from sergevanginderachter/issue_8159
Load existing group_vars file for new group_by group
11 years ago
Serge van Ginderachter 4e9a253bef Load existing group_vars file for new group_by group
if it was not loaded yet, which happens if that group
didn't exist yet in the inventory.

fixes #8159
11 years ago
James Cammarata 42b5294820 Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel 11 years ago
Felix Geyer 0ebd19e97b Fix regression: Sanitize sudo success_key from stdout
Commit 7e3dd10 caused a regression with sanitizing the sudo success_key from stdout.
There is no newline in front of SUDO-SUCCESS when using sudo.
This change adapts the regex to make the line break optional.

Tested on Ubuntu 14.04.
11 years ago
Ruggero Marchei 909955f2e2 fix get_distribution_version() on amazon linux 11 years ago
Jacob Leverich 7a8eb0b670 Set Jinja2's keep_trailing_newline=True in template_from_string.
Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
11 years ago
James Cammarata e74853300a Merge branch 'task-host-loop-bypass' of https://github.com/sivel/ansible into sivel-task-host-loop-bypass 11 years ago
James Cammarata cdb9f13559 Merge pull request #7605 from sivel/delegate-callback-hint
Show delegate_to hint in callback output
11 years ago
James Cammarata 4fc8d4b6fe Merge pull request #7649 from sivel/vault-password-script
Allow --vault-password-file to work with a script as well as a flat file
11 years ago
Serge van Ginderachter e8b45a9ef7 Invalidate host/group variables cache when loading
extra varsiables based on playbook basedir.
11 years ago
Serge van Ginderachter d39ff55688 Fix logic bug when loading vars for a new playbook basedir. 11 years ago
James Cammarata db96344966 Re-fixing ability to have empty json files after inventory refactoring 11 years ago
James Cammarata 4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 11 years ago
Bjorn Neergaard 08f97c0b9d Fix hostname when get_distribution_version() returns a string.
The distro version is a string ('jessie/sid') on Debian unstable and testing.
Because load_platform_subclass() evaluations every subclass as it loops,
comparing numbers when get_distribution_version() does not return a number will
break.

This patch fixes that by returning a number (`0`) when we have an invalid
version, instead of returning `None` or a string.
11 years ago
Dan Slimmon 307a3e8a9c Fixed regex square-bracket bug.
Regexes were being parsed like ordinary ansible host patterns, so
square-bracket groups were getting interpolated wrongly.
11 years ago
James Cammarata b8ac094eaa Tweak to only show msg on assert failure if set 11 years ago
James Cammarata 16332b8488 Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg 11 years ago
James Cammarata aa261bdd14 Optimizing groups_for_host() lookup in inventory 11 years ago
James Cammarata fe892fccb1 Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor 11 years ago
James Cammarata 11a5fc85f4 Merge branch 'inventory_refactoring' into svg_and_inventory_refactor 11 years ago
James Cammarata bcf83cbc24 Merge branch 'sergevanginderachter-inventorytree' into svg_and_inventory_refactor 11 years ago
Serge van Ginderachter ff4119adc0 Performance optimization in resolving host patterns
Avoid resolving a pattern that is a plain host. When matching a hostname in the
hosts_cache, just use the host object from there.

When running a task on say 750 hosts, this yields a huge improvement.
11 years ago
Matt Martz 6591dd560d Show delegate_to hint in callbacks 11 years ago
Leonid Evdokimov d94395f48c assert: add optional `msg` argument
Sample playbook when it may be useful:
```
- uri: return_content=yes url={{ api_base }}/action/{{ inventory_hostname }}
  register: output
- assert:
    msg: '{{ output.json | to_nice_json }}'
    that:
      - output.json.foo != "bar"
      - output.json.boo == 42
```
11 years ago
James Cammarata 7f8de3a265 Merge pull request #8024 from kcghost/7941
removed port from domain name qualification, fixes #7941
11 years ago
James Cammarata ff04b2b532 Allow empty yaml vars files
Fixes #7843
11 years ago
Michael DeHaan 51e014d915 Merge pull request #8012 from cchurch/callback_cleanup
Callback plugin cleanup
11 years ago
Michael DeHaan c2ac8fda1e Data from inventory scripts should be able to use nested Jinja2 expressions. 11 years ago
Henry Finucane de64bbdc5f Support a whitelisted subset of jinja2 template options 11 years ago
Casey Fitzpatrick 7115cb1f37 removed port from domain name qualification, fixes 7941 11 years ago
Marc Abramowitz 5b783e0bc6 Error if private_key_file is group/world readable
Currently, if you have this, ansible fails with a generic error and
suggests running again with `-vvvv`. This isn't bad but pinpointing the
specific problem immediately is even more user-friendly.

```
$ ls -l devops.pem
-rw-r--r--+ 1 marca  staff  1679 Jul  2 11:25 devops.pem

$ ansible -m ping --private-key=devops.pem mt3-pyweb01
mt3-pyweb01 | FAILED => private_key_file (devops.pem) is group-readable or world-readable and thus insecure - you will probably get an SSH failure
```
11 years ago
James Cammarata 81f35323e9 Revert "Fix get_distribution() for platforms that may have spaces"
This reverts commit 2493020d9f.
11 years ago
Chris Church 955dadf743 Remove runner_on_error callback that is never used. 11 years ago
Chris Church 4e98e3785a Reset play attribute on callback plugins when a play fails. 11 years ago
Chris Church 30fae95efe Change variable from pattern to name to correctly indicate what is being passed to the callback. 11 years ago
James Cammarata 8ed6350e65 When parsing json from untrusted sources, remove templating tags 11 years ago
James Cammarata eeb597360e Further safe_eval fixes 11 years ago
dewey hylton 379e1a49cb fix swap translation on 4.x openbsd with 2.5.4 python 11 years ago
Michael Scherer f0a7139290 Fix exec_command prototype for the plugin 11 years ago
mesk41in 488aec3936 Fix unsupported regexp parameter in assemble 11 years ago
James Cammarata 539426f612 Performance tuning inventory functions for large inventories 11 years ago
James Cammarata 35368e531b Additional fixes for safe_eval 11 years ago
James Cammarata 5429b85b9f Change safe_eval to a strict white list 11 years ago
James Cammarata d8a7b49b59 Merge branch 'inventorytree' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-inventorytree 11 years ago
Matt Martz 19f5ce2c9c Allow --vault-password-file to work with a script as well as a flat file 11 years ago
James Cammarata 1adb6dfa05 Remove redundant 'self.user or' added by 0f91add 11 years ago
Thomas Mangin 0f91add86f Explicitly set the user option for ssh connections
Fixes #7170
11 years ago
Paul Sokolovsky f8bf9cdeec Handle TemplateNotFound to render more helpful error message.
At the point the exception is handled, it is likely due to error loading
a sub-template included from main template. Besides file not found, it
can be caused also by include path failing Jinja2 checks. Now, when
rendering the exception from Jinja, it will include exception name. This
will give basic context or *what* the error is.

Fixes #7103
Fixes #7105
11 years ago
James Cammarata 5d65c1c4a4 Merge branch 'Mbosco-patch-1' into devel 11 years ago
James Cammarata 6bd0621037 Merge branch 'devel' of https://github.com/ansible/ansible into devel 11 years ago
James Cammarata 1702c2fd50 Merge branch 'patch-1' of https://github.com/Mbosco/ansible into Mbosco-patch-1 11 years ago
James Cammarata 9564818e1e Merge branch 'fix_lineinfile_newlines' into devel 11 years ago
James Cammarata 59c5d6292b Merge pull request #7902 from jirutka/filter-relpath
Add os relpath filter
11 years ago
James Cammarata ce41b02300 Merge pull request #7887 from s0x/funtoo-gathering-facts
Check for empty os-release file, fixes #7885
11 years ago
Jakub Jirutka 726a61eb43 Add os relpath filter 11 years ago
Chris Church 6aaad5dc9b Fix missing arg for _remote_chmod method. 11 years ago
Ivo Senner f4fd9d366b Check for empty os-release file, fixes #7885 11 years ago
Chris Hoffman cf997beb07 Shell expand DEFAULT_ROLES_PATH fixes #4897 11 years ago
James Cammarata 94963290b9 Merge pull request #6981 from aliles/fix-localhost-executable-with-flags
Fix localhost tasks with complex executables
11 years ago
James Cammarata 3c3c710a58 Merge branch 'module_safe_eval' into fix_lineinfile_newlines 11 years ago
James Cammarata d8bb116c1a Merge branch 'devel' of https://github.com/tgolly/ansible into tgolly-devel 11 years ago
Michael DeHaan 5156794738 Merge pull request #7861 from cchurch/devel
Windows Remote Support
11 years ago
Chris Church 615f70e3f4 Fix missing space in script action plugin. 11 years ago
Chris Church dd3f7c2dab Fix trailing slash on returned temp path. 11 years ago
Chris Church 8a121fd6ae Squeeze a few more bytes out of put_file script. 11 years ago
Chris Church 4e738e6fa9 Optimize buffer size for put_file. 11 years ago
Matt Martz 09dd535296 Make helper functions more robust against undefined powershell objects 11 years ago
Chris Church 43a7a5a990 Collapse extra whitespace in encoded powershell scripts. 11 years ago
Matt Martz df8866b8bd Add examples for how to use powershell common functions 11 years ago
Matt Martz e4e610565c Add convenience function (Get-Attr) for getting an attribute/member from a powershell psobject 11 years ago
Matt Martz 90c98ada7c Add ConvertTo-Bool filter function in powershell common code 11 years ago
Chris Church 61c236be9e Fix for creating temp dir with older powershell versions. 11 years ago
Chris Church 243cd877ae Add integration tests for fetch/slurp, make powershell fetch/slurp work as close as possible to existing fetch/slurp modules. 11 years ago
Chris Church a8ca579761 Fix host parameter to vvvvv. 11 years ago
Matt Martz 97f4f56286 Add Exit-Json and Fail-Json powershell helper functions 11 years ago
Chris Church 74c43c94cf Allow specifying remote powershell version via environment variable. 11 years ago
Chris Church 8f762a7d15 Update logging based on verbosity, add vvvvv support to show details of put/fetch file. 11 years ago
Chris Church 21ba529fbe Fixes/notes related to slashes in remote paths. 11 years ago
Chris Church 7e8cc65829 Refactor common args used for building PowerShell commands. 11 years ago
Matt Martz e7e95721b9 powershell modules will have a .ps1 extension 11 years ago
Matt Martz a25c441300 Add shared functions to module_utils/powershell.ps1 and refactor powershell modules to utilize the common powershell code 11 years ago
Michael DeHaan bafa63b424 Revise documentation on powershell module replacer code. 11 years ago
Chris Church f7af29680b Add default license boilerplate, refactor common powershell code, fixes for raw/script modules. 11 years ago
Michael DeHaan 35a7c93c76 Added comment about implementation line. 11 years ago
Michael DeHaan 3ac86e57f4 FIXME comment cleanup 11 years ago
Michael DeHaan 80499346d1 Remove stray FIXME 11 years ago
Chris Church 5dcaa30476 Add shell_plugins to abstract shell-specific functions out of runner, add winrm connection plugin, add initial Windows modules. 11 years ago
James Cammarata 360d8b0fc2 Don't try to scan SSH signatures for non-ssh urls
Fixes #7812
11 years ago
James Cammarata 2493020d9f Fix get_distribution() for platforms that may have spaces
The new CentOS 7 beta lists the distribution as "CentOS Linux", which
breaks the distribution detection and class loading. This patch fixes
that by taking just the first entry in the string when a space is
detected.
11 years ago
James Cammarata 3529b1cb33 Merge branch '7763' of https://github.com/rmarchei/ansible into rmarchei-7763 11 years ago
Michael DeHaan 627ff30a6f Add module replacer capability for powershell files. 11 years ago
Ruggero Marchei e3f5af377f move get_distribution_version() to basic.py 11 years ago
James Cammarata cb13b30362 Use file documentation fragement for the copy module 11 years ago
James Cammarata 9b17e8a555 Merge pull request #7771 from jkramarz/issue-5761
Added missing fallback to hw_sector_size
11 years ago
James Cammarata 6d9cc64e0f Add role_names to valid keys entry for plays
Prevents a "not a legal parameter" error for play ds structures that
may be passed into the Play() constructor, which really is mainly a
concern during tests.
11 years ago
Matt Bray 578e881142 fix for urls like ssh://git@github.com/ansible/ansible.git 11 years ago
Jakub Kramarz df3188cef0 Added missing fallback from physical_block_size to hw_sector_size in sectorsize fact discovery for kernels older than May 2009.
References #5761
11 years ago
James Cammarata 3fb3e7e6dc Properly parse urls for ssh-keyscan use
Previously, the get_fqdn() function in known_hosts.py only worked
with urls that started with git@, and ignored any urls that started
with a normal schema type (ie. http:// or ssh://). This patch corrects
that by using urlparse to parse the hostname portion out of urls that
have a proper schema.

Fixes #7474
11 years ago
James Cammarata 395192ffbc Merge pull request #7740 from jkramarz/issue-5761
changed sector size fact source
11 years ago
James Cammarata b4d130d086 Add a new password pattern to the run_command filter 11 years ago
Jakub Kramarz 4e4c9235e8 changed sector size fact source from hw_sector_size to physical_block_size, fixes issue 5761 11 years ago
Stefan Lapers 78f4842982 fix incorrect secondary ip handling, fixes #7724 11 years ago
Eri Bastos a65fd06338 Added quotes around key path - Issue 7713 11 years ago
James Cammarata e5ef0eca03 Merge pull request #6507 from brdo/patch-1
Set keepalive to 5 seconds in paramiko_ssh.py
11 years ago
smoothify e3530dcbc2 Add environmentfilter to random filter, to ensure the result doesn't get cached. Mirrors default jinja filter. 11 years ago
Dag Wieers fd6f0cb4b4 Update facts.py 11 years ago
Dag Wieers 14a9966984 Added cross-platform uptime fact
Having an uptime fact allows you to check after a reboot whether the system was effectively rebooted.

```yaml
  - name: Safeguard - Was system properly rebooted ?
    action: fail msg="System was not properly rebooted"
    when: ansible_uptime > 900
```

This patch has been tested on Linux, Solaris and HP-UX.
11 years ago
James Cammarata ad97c618cf Add support for relative paths in the file lookup plugin for roles
Fixes #7628
11 years ago
James Cammarata 82a784931e Fix error passing play vars to an included playbook with empty vars
Fixes #7658
11 years ago
James Cammarata d9df607972 Fix order of merging variables for the combined cache
Fixes #7598
11 years ago
James Cammarata 74f20ebf79 Removing cruft leftover from the deprecation of include+with_items
Also cleaning up integration tests that had checks for the empty item
attribute in certain results.

Fixes #7535
11 years ago
James Cammarata 0fa5100a2c Merge branch 'fix-7596' of https://github.com/kilburn/ansible into kilburn-fix-7596 11 years ago
James Cammarata 849b0f87ce Fix error when using os.getlogin() without a tty 11 years ago
Brian Coca ce8c8ab146 now unique actually works, all operations also now use it to return
unique lists.
11 years ago
Michael DeHaan 959af67fe3 Merge pull request #7608 from jjneely/lookup-function
template.py: Handle purposely raised exceptions in lookup()
11 years ago
James Cammarata b94bde9711 Merge pull request #7609 from jimi-c/issue_7553_su_copy
Support checking for su user to atomic_move
11 years ago
Jack Neely 2fda9bc743 template.py: Handle purposely raised exceptions in lookup()
If a lookup plugin is run by the lookup() template method it should pass
along any AnsibleError (or child exception classes) rather than just eat
them.  These exceptions are purposely raised by the plugin.
11 years ago
Marc Pujol d0f82e94e8 Ensure there are no duplicates in the merged/intersected lists 11 years ago
Marc Pujol f892cc798c Merge and intersect lists without using sets.
Using sets for these operations is dangerous because sets cannot contain
certain object types (such as lists) and their iteration order is
undefined.

Fixes #7596
11 years ago
James Cammarata 188ab7b952 Check groupnames for None as well as an empty string in add_host
Fixes #7585
11 years ago
James Cammarata feafc4cd8a Merge branch 'fix_mutable_inventory_vars' of https://github.com/banterchat/ansible into banterchat-fix_mutable_inventory_vars 11 years ago
Isao Jonas 72524e1f3b dont mutate inventory vars 11 years ago
James Cammarata 061911c9c2 Merge pull request #7558 from dermute/pkg_mgr
added solaris fact detection for ansible_pkg_mgr
11 years ago
James Cammarata e99df21647 Support checking for su user to atomic_move
Fixes #7553
11 years ago
James Cammarata fa86eef9f9 Make sure value in regex_replace is a string
Fixes #7551
11 years ago
James Cammarata ca734fde8b Merge pull request #7544 from rik2803/patch-2
Differentiate machinfo output key/val separator
11 years ago
James Cammarata cfd8c685d1 Correct issue of handlers running on all hosts incorrectly
Also adds an integration test to catch this bug in the future.

Fixes #7559
11 years ago
Alexander Winkler 4980e76a3a added solaris fact detection for ansible_pkg_mgr 11 years ago
Brian Coca 8f58ae3305 changed exception handling for hashable test 11 years ago
rik2803 cfcbc954f5 Differentiate machinfo output key/val separator
get_hw_facts for HP-UX: machinfo in HP-UX B.11.23 uses '=' as separator between key and value, while B.11.31 uses ':'.
11 years ago
Yang Liping aedf134fc4 Fix portability issue when checking local facts file permission. 11 years ago
James Cammarata 92f16b3d6f Merge pull request #7539 from jimi-c/issue_7503_freebsd_su_fixes
Fixes for su on freebsd
11 years ago
Brian Coca 0dce5dae26 set theory v2, now can handle non hashable items like dicts 11 years ago
James Cammarata e0c4c51c1f Merge pull request #7517 from amenonsen/double-error
Don't double (or triple) up common error messages
11 years ago
James Cammarata d77a6965b3 Merge module_vars into inject during template instead of updating
This way we won't overwrite values that are stored in the inject
with module_vars that should be lower precedence.

Fixes #7510
11 years ago
Abhijit Menon-Sen f6792b724a Don't double (or triple) up common error messages
process_common_errors() was called thrice, each time appending to the
existing error message, and leading to confusing repetition in the
message that was finally displayed.

Fixes #7498
11 years ago
James Cammarata 1e672a0fec Fixes for su on freebsd
Addresses multiple issues when using su on freebsd including
* su prompt differs between platforms, so turned that check into a
  regex comparison instead of a simple string comparison
* not using '-c' after su causes problems, so added that for all
  platforms
* fixed quoting issues due to multiple uses of '-c' introduced by
  the above fix

Fixes #7503
Fixes #7507
11 years ago
James Cammarata 32628eef85 Merge pull request #7481 from jimi-c/issue_7396_env_lookup
Don't use listify_ function, when all we want to do is template variable...
11 years ago
WAKAYAMA shirou 56880b76bb fix UnicodeEncode error when using pause module with unicode prompt. 11 years ago
WAKAYAMA shirou 346bb611c7 fix UnicodeEncodeError when prompt is unicode. 11 years ago
James Cammarata e36a8d466e Don't re-query inventory when trimming failed/dark hosts
Since the filter list contains hosts, passing that back to list_hosts()
in the inventoy causes issues when the hostname is an IPv6 address
(with :'s interpreted as group unions). Since we already have the list
of hosts, we should not need to pass that back through inventory a
second time.

Fixes #7446
11 years ago
James Cammarata 365bfd732e Don't use listify_ function, when all we want to do is template variables
This was causing a bug in the env module, due to the fact that we now
pass variables for the module through the templating engine combined
with the fact that we split-up the hostvars and setup variables. As a
result, if a variable in the env lookup had the same name as the variable
in Ansible, it would try and template itself over and over again until
the recursion limit would be hit, at which time an empty string was
returned.

Fixes #7396
11 years ago
James Cammarata 0ac74aaf59 Also set the environment variables when resetting the locale to C 11 years ago
James Cammarata 1f0be3753d Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions
Fix skip dir inventory extensions
11 years ago
James Cammarata d44ed533b3 Default use_proxy to True for fetch_url()
Also added some error handling to the fetch_url() call in the
apt_repository module, so that failures to look up the PPA info
are properly handled.

Fixes #7322
11 years ago
James Cammarata 08406c0ee2 Adding the capability to proxy the ssl cert check
The ssl cert check will now respect the http and https proxy
environment settings. The url may also have the username/password
embedded, in which case basic auth will be used to connect to the
proxy server.

Fixes #7413
11 years ago
Matt Martz 0e953c2863 Add run_once task key
This caused the task to act like  bypass host loop plugin and
execute only on a single host. Can be used with delegate_to
11 years ago
James Cammarata 285d9878ae Reset locale to 'C' if the specified one is invalid
Fixes #7448
11 years ago
Kevin Bell 92bd755b47 Fixed extension filtering in InventoryDirectory 11 years ago
James Cammarata df877f2e79 Check module_path permissions when creating ssh_wrapper for git
If the module directory is not writable/executable to the current user
(most likely because of a sudo to a non-root user), the ssh_wrapper
will be created in the default location for mkstemp() calls. To facilitate
the deletion of these new files, a new mechanism for cleaning up files
created by the module was also added.

Fixes #7375
11 years ago
Michael DeHaan 3b8a35d65e Merge pull request #7406 from specnazzz/fix-python24
Fix known_hosts.py to work on older versions of python
11 years ago
James Cammarata 79731ce491 Evaluate changed_when only if task is not skipped
Fixes #7405
11 years ago
Michal Mach 60451c20ab Fix known_hosts.py to work on older versions of python 11 years ago
James Cammarata 7faecd54b0 Merge pull request #7388 from jimi-c/issue_7384_vars_files_include
Pass vars_files on to included playbooks too
11 years ago
James Cammarata a9311a5dcb Merge branch 'file_new_dirs_perms' of https://github.com/bcoca/ansible into bcoca-file_new_dirs_perms 11 years ago
James Cammarata 56515a38d5 Only chown on atomic move if the uid/gid don't match the src/tmp file
This is a corner case for remote file systems that don't support
chown() and where the source and destination for the atomic_move
are on that remote file system.

Fixes #7372
11 years ago
James Cammarata 525e7339ed Merge branch 'pass-basedir-to-runner-on-setup' of https://github.com/ByteInternet/ansible into ByteInternet-pass-basedir-to-runner-on-setup 11 years ago
James Cammarata 85bd6810bb Pass vars_files on to included playbooks too
Fixes #7384
11 years ago
Allard Hoeve c5833f9869 Add missing basedir to Runner in _do_setup_step 11 years ago
James Cammarata 360ffc4dfd Properly merge role conditionals in with pre-existing conditionals
Fixes #7387
11 years ago
James Cammarata 187619c7fe Use utils.combine_vars on vars_files data
Fixes #7345
11 years ago
James Cammarata 809b931640 Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir
Do not base synchronize source on the inventory directory
11 years ago
Marco Re 712f4a631c Update ssh.py
Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
11 years ago
Chris Church d725636469 Correctly initialize combined_cache for hosts if setup is skipped
Fixes #7364
11 years ago
James Cammarata 38c2c60849 Do not base synchronize source on the inventory directory
Fixes #7366
11 years ago
James Cammarata fd27afdc0d Adding ansible_shell_type and basic environment construction on it
Previously we assumed the shell on the target systems were 'sh'-
compliant when formatting environment variables preceding command
strings. This patch corrects that by basing the target shell type
on the DEFAULT_EXECUTABLE setting, which can be overridden on a
per-host basis using the inventory variable 'ansible_shell_type'.

Fixes #7352
11 years ago
James Cammarata 9b9b4d50fe Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False
Fix #7057 missing False default for vars_prompt
11 years ago
James Cammarata 51ef28b0d2 Merge branch 'warn_wrong_sudo_password' of https://github.com/tyll/ansible into tyll-warn_wrong_sudo_password 11 years ago
James Cammarata 2e2e5d5321 Use the existing module_vars during the templating of module_vars
Since some of the vars contained in there may be used in the templating
of other variables. This also reverts e83a494 which originally fixed
issue #6979 but broke some other variable related things.

Fixes #6979
Fixes #7321
Fixes #7332
11 years ago
James Cammarata 77a47dbb2d Merge pull request #7304 from jimi-c/issue_7296_synchronize_relative_path
Make sure dwim'd relative path ends in a "/" if the original does
11 years ago
James Cammarata 393124e462 Add pyc/pyo to ignore list for inventory directories
Fixes #7308
11 years ago
Brian Coca 8a84b22d76 bumped to 1.7 11 years ago
Chris Church f9c74d6e57 Add integration tests for group_by module. Fixed bug introduced by ansible/ansible#7273 while also fixing issue described in ansible/ansible#6953 11 years ago
James Cammarata 4d118d1c72 Make sure dwim'd relative path ends in a "/" if the original does
Fixes #7296
11 years ago
James Cammarata 56d070afa8 Version bump for 1.7 11 years ago
James Cammarata fd03cc04e6 Merge branch 'devel' of https://github.com/denisphillips/ansible into denisphillips-devel 11 years ago
Veeti Paananen d6f4d9b76d Fix error handling on missing dest with unarchive
fixes #7107
11 years ago
Denis Phillips cd0134d290 Used module_args passed to function instead of from runner 11 years ago
Christian Berendt 6676720ce5 fixed typos found by RETF rules in PY files
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
11 years ago
James Cammarata deb532c367 Remove OrderedDict references from runner
Fixes #7256
11 years ago
James Cammarata 54b1f820fb Modify the way we set the localization environment
Previously, we set the LANG (and LC_CTYPE) environment variables
directly in the module code and applied them with os.environ().
Instead, we are now pre-pending those variables to the environment
string used to execute the command which allows the user to
override the localization values by setting the environment values
directly (even on a per-task basis):

  - subversion: repo=file:///path/to/repos/svn_über dest=/tmp/svntest
    environment:
      LANG: "C"
      LC_CTYPE: "en_US.UTF-8"

So if a user wishes to default their LANG back to C, they can still
avoid unicode issues by doing the above.

Fixes #7060
11 years ago
James Cammarata 40a7a306f5 Merge pull request #7236 from jcassee/robust-ssl-cert-concat
Make concatenating certs robust in urls.py
11 years ago
James Cammarata 8e45fa9b63 Moving display-related functions to new module in utils 11 years ago
Joost Cassee 978e6d2cd6 Make concatenating certs robust in urls.py
Add a newline after each certificate file explicitly to avoid problems
with files that do not end with a newline themselves.
11 years ago
James Cammarata 6069ff6e9e Adding a new system_warnings config option to supress warnings 11 years ago
James Cammarata 30e4759055 Merge pull request #7208 from jf/copy-module
Fix "no_log=True" option for copy module (fixes #7193)
11 years ago
James Cammarata be4e6d359f Merge branch 'delegate_to_honor_ssh_private_key_file' of https://github.com/renard/ansible into renard-delegate_to_honor_ssh_private_key_file 11 years ago
James Cammarata 4cadcccc48 Catch pycrypto warning about gmp and show a nice warning on stderr 11 years ago
Jeffrey 'jf' Lim 0bf1a27393 Fix "no_log=True" option for copy module (fixes #7193) 11 years ago
Jiri Barton 9da06274a8 Set proper file permisions when a file is created with atomic_move
Fixes #7196
11 years ago
Michael DeHaan 9a6998aa17 While this code is unused, this remote module copy of this function should not be carried around in the source code. 11 years ago
Logos01 424ee36e05 Enable facts module on older SuSE systems
Modified logic of distribution_release for SuSE to retain the last discovered key/value pair's value in /etc/SuSE-release that contains a '=' character.
11 years ago
James Cammarata 1576e8d611 Adding missing options to the file documentation fragment 11 years ago
Brian Coca c5d5481ebb added doc noting the change in behaviour 11 years ago
Cédric RICARD b8b0865ec0 Missing 'base64' import 11 years ago
Michael DeHaan ad04b455d3 add missing license header 11 years ago
James Cammarata 117952cf6c Fixing a bug in the new fetch_url username/password logic 11 years ago
James Cammarata b9d8b3b911 Merge pull request #7132 from jimi-c/issue_6601_hide_vault_yaml
Hide YAML content on syntax errors when a vault password is specified
11 years ago
James Cammarata 89fa9b7305 Add parameters to get_url for the url username/password
Fixes #6928
11 years ago
James Cammarata e9d8f0639f Merge pull request #7143 from sivel/ansible-sudo-from-root-fix
Allow sudo to another user from root with the ansible command
11 years ago
James Cammarata 460794d697 Merge pull request #7140 from jimi-c/issue_6962_traceback_callbacks_unicode
Fix handling of non-JSON lines in responses
11 years ago
Matt Martz eb8759176f Allow sudo to another user from root 11 years ago
James Cammarata 5e598c5337 Fix handling of non-JSON lines in responses
Garbage lines with ' = ' in them were causing parsing errors,
where key=val lines should not have spaces around the equals.

Fixes #6962
11 years ago
James Cammarata 38b49476f8 Merge branch 'raw-script-su-support' of https://github.com/sivel/ansible into sivel-raw-script-su-support 11 years ago
James Cammarata 93b5769d94 Hide YAML content on syntax errors when a vault password is specified
Fixes #6601
11 years ago
Michael Scherer 0f0f5ff1ce Give more information when a task is empty
I made a typo in a playbook and was great by:

    ERROR: expecting dict; got: None

The issue was a single - on the last line of a playbook.
With the name of the file, I was able to see right away where the
error was.
11 years ago
James Cammarata e83a494e41 Make sure VARS_CACHE for hosts are updated with the play vars too
Fixes #6979
11 years ago
James Cammarata a6068b09ac Fix collision in random filter name by merging functionality
Merges the functionality of the original jinja2 random filter with
the one we provide.

Fixes #7113
11 years ago
James Cammarata c115c34a1f Set the default LANG to en_US.UTF-8 and also set LC_CTYPE
Fixes #6737
11 years ago
Brian Coca c3e559b914 should now work with versions older than 8.4 11 years ago
faust64 78b9a11ccf Update facts.py
Fixes #7093 --devel
11 years ago
James Cammarata 68c30548e0 Properly catch and decode unicode strings in module _log_invocation()
Fixes #7084
11 years ago
James Cammarata 4f673b9497 Merge pull request #7083 from mscherer/better_message_multiple_action
Improve error message when multiple action are given
11 years ago
James Cammarata 39c6141b4a Merge pull request #7082 from bcoca/freebsd_mtu_fix
fixed issue with FreeBSD network facts
11 years ago
James Cammarata 086b877719 Merge pull request #7079 from mscherer/fix_error_whitespace_in_config
Clean a bit more the ssh_args configuration
11 years ago
James Cammarata 54f86099e4 Merge pull request #7078 from mscherer/fix_error_message_controlpersist
Enhance error message about missing ControlPersist
11 years ago
Michael Scherer 1e34e95ba0 Improve error message when multiple action are given
This can be illustrated using this playbook:

    - command: id
      delegate_to: "{{ remote_server }}"
      user: "{{ remote_user }}"

The error is to use 'user' instead of 'remote_user', but the error message
do not really mention it, so it can be a bit hard to spot.
11 years ago
Brian Coca e5f297697a ifconfig changed on FreeBSD, tested this on 8,9 and 10 latest stable
versions and it now works
11 years ago
Brian Coca bc23926f42 fixed ETIME issue on FreeBSD 8 through 10, which broke all fact
gathering
11 years ago
Michael Scherer c87afc1109 Clean a bit more the ssh_args configuration
If someone add ssh_args = " " to his .ansible.cfg, it will result into
strange failure later :

    <server.example.org> ESTABLISH CONNECTION FOR USER: misc
    <server.example.org> REMOTE_MODULE ping
    <server.example.org> EXEC ['ssh', '-C', '-tt', '-q', ' ', '-o', 'KbdInteractiveAuthentication=no',
    '-o', 'PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey', '-o', 'PasswordAuthentication=no',
    '-o', 'ConnectTimeout=10', 'server.example.org', "/bin/sh -c 'mkdir -p /tmp/ansible-tmp-1397947711.21-5932460998838
    && chmod a+rx /tmp/ansible-tmp-1397947711.21-5932460998838 && echo /tmp/ansible-tmp-1397947711.21-5932460998838'"]
    server.example.org | FAILED => SSH encountered an unknown error during the connection. We recommend you re-run the
    command using -vvvv, which will enable SSH debugging output to help diagnose the issue

The root cause is the empty string between -q and -o, who kinda break mkdir.
11 years ago
Michael Scherer 3a09c99811 Enhance error message about missing ControlPersist
ansible_ssh_args is good for playbook, but in the ~/.ansible.cfg
file, it should be ssh_args in a specific section.
11 years ago
James Cammarata ae29e43f93 Merge branch 'issue_7009_nfs_selinux' into devel 11 years ago
James Cammarata a32dd34359 Make sure HostVars object is instantiated before assigning it
Fixes #7006
11 years ago
Jim Kleckner 46ec238613 Fix #7057 missing False default for vars_prompt
The test for default should be "is not None" since a boolean value of
False is a valid value.

See discussion at:
  https://groups.google.com/forum/#!topic/ansible-project/oc1_zE-FnyI
11 years ago
James Cammarata 75e0b7a5cf Make sure umask is set restrictively before creating any vault files 11 years ago
James Cammarata 3715482d7c Determine selinux context for NFS mount points correctly
Fixes #7009
11 years ago
Sébastien Gross 22d6572270 Honor ansible_private_key_file for delegated hosts
If a delegated host is not found in the inventory specified
private_key_file for primary host was not used.

This allows running playbooks without having to define any inventory at
all and to use the same ssh private key for both primary host and
delegated one.
11 years ago
Wim 6ed4ca97a8 hint to install python-ssl on redhat systems 11 years ago
smoothify 48bf7a000d Try to pass in item to on_skippped callback. 11 years ago
James Cammarata d240d073eb Changing SSL cert detection method to allow for auto-negotiation of SSL protocols
Fixes #6904
11 years ago
James Cammarata 23c5f4524d Make sure args in run_command are encoded for shlex.split calls on py2.6 11 years ago
James Cammarata d494a163f9 Merge pull request #6900 from jimi-c/issue_6891_cifs_mount_hang
Add a timeout decorator for timing out functions that may hang
11 years ago
James Cammarata ba1a6c2e11 Removing .orig file merged in accidentally 11 years ago
James Tanner aad128bac7 Use combined cache for templating module vars
Fixes #6901
11 years ago
James Cammarata 40b958e348 Don't turn complex args back into a k=v string for the synchronize module
Fixes #6951
11 years ago
James Cammarata 2cc4ac2e75 Catch traceback caused by permissions errors during a local md5 sum
Fixes #6948
11 years ago
Aaron Iles a5507275cb Fix localhost tasks with complex executables
Enable the use of executable commands that use command line options with
the localhost command runner. These commands require parsing out the
base executable from the command string to pass to subprocess.
11 years ago
jctanner bfb25f4f89 Merge pull request #6917 from bcoca/random_filter_clean
simple random filter
11 years ago
jctanner af99abc81c Merge pull request #6913 from willthames/aws_module_doc_fragments
Use common module document fragments for AWS modules
11 years ago
James Tanner 4eb626825b Refactor play._update_vars_files_for_host to make common functions and easier debugging
Fixes #4883
11 years ago
Brian Coca 80cd217eb7 simple random filter 11 years ago
willthames 509561f658 Moved AWS modules over to common module fragments
Created common module doc fragment, and applied to all
modules that use ec2_connect or connect_to_aws as
they definitely share the common doc fragments
11 years ago
James Cammarata 5ce6c86595 Merge branch 'sudo_pass_typo' of https://github.com/tyll/ansible into tyll-sudo_pass_typo 11 years ago
James Cammarata eebc72ab9b Add a timeout decorator for timing out functions that may hang
Fixes #6891
11 years ago
James Tanner 2d33cd1b5d Fixes #6894 add missing file and remove debug line 11 years ago
James Tanner 68cd7258b6 Fixes #6894 create docs fragment for files 11 years ago
Serge van Ginderachter d240e2b9fb Introduce an ansible_version dict as runner variable
Given the version:
    "1.6 (ansible_version_var 14499e8bf3) last updated 2014/03/21 17:07:50 (GMT +200)"

  We get the special variable:
    "ansible_version": {
        "full": "1.6",
        "major": 1,
        "minor": 6,
        "revision": 0,
        "string": "1.6 (ansible_version_var 14499e8bf3) last updated 2014/03/21 17:07:50 (GMT +200)"
       }

	modified:   lib/ansible/playbook/__init__.py
	modified:   lib/ansible/runner/__init__.py
	modified:   lib/ansible/utils/__init__.py
11 years ago
James Cammarata 9ca8c3262c Switch module safe_eval to ast.literal_eval 11 years ago
James Tanner 318e752b6f Fixes #6845 evaluate changed_when only if task is not skipped 11 years ago
Michael DeHaan ccdd91f9c2 Merge pull request #6861 from ericlake/devel
add distribution_major_version to fact gathering
11 years ago
James Tanner 5a65dc3b6a Fixes #6820 fix erroneous missing vault password error when using the template module 11 years ago
Eric Lake 7f9736198a add distribution_major_version to fact gathering 11 years ago
Serge van Ginderachter e36e2d38fe InventoryDir: another fix for the host.groups list
In some cases, where a host is mentioned in multiple groups, and those
groups are referenced in multiple ini files, a group could still contain
multiple instances of a group in its host,groups list, where only one of them
is the right group, that exists in the inventory.
11 years ago
James Cammarata 82b24c162e Adding delimiter fixes to action_plugin + fixing local assembling with a delimiter
Also added a new integration test for assemble using local assembly
with a delimiter.
11 years ago
Michael DeHaan 2c7275e8a9 Merge pull request #6835 from sivel/version-compare-filter
Add version_compare filter
11 years ago
Michael DeHaan 0a574af270 Merge pull request #5555 from sivel/expose-playbook-to-callback
Expose the playbook to callback plugins
11 years ago
Michael DeHaan 1fa19e29e8 Use common file argument system previously implemented by @sivel for rax modules on the file modules as well (copy/file/template).
Application to other cloud providers would make very good sense.
11 years ago
Matt Martz 7b5f89ec7c Use PluginLoader for module docs fragments 11 years ago
Matt Martz bb6f7a267a Add support for shared module documentation fragments 11 years ago
James Cammarata ee0a0b492b Allow isprintable() util function to work with unicode
Fixes #6842
11 years ago
James Tanner cdc0819939 Fixes #6088 turn off sudo and su if the connection is local the sudo user matches the current user 11 years ago
jctanner 2a9fcdd87c Merge pull request #6711 from j2sol/raw-unreachable
Treat 255 errors from raw as dark host
11 years ago
jctanner f6db60cbce Merge pull request #6787 from tyll/pull_ssh_prompt
ssh: propagate prompt to _communicate()
11 years ago
Matt Martz 5770428e91 Add version_compare filter 11 years ago
James Cammarata 317c2f4bc0 Fixes to variable issues introduced by recent changes
Fixes #6801
Fixes #6832
11 years ago
Harlan Lieberman-Berg 876b8085aa Add directory_mode to common file parameters to prevent errors. 11 years ago
Michael DeHaan 904f331210 Merge pull request #6788 from tyll/pull_ssh_verbose_comments
ssh connection plugin: Make comments more verbose
11 years ago
James Cammarata a6a4680e5c Fix variable naming issue in _load_tasks()
Fixes #6800
11 years ago
James Cammarata 6f34a6336f Differentiate decryption failures from empty data files in ansible-vault
Fixes #6822
11 years ago
BoscoMW 39fcbd1f10 Update ssh.py 11 years ago
BoscoMW 165406cf35 Catch permissions errors related to opening a known_hosts file
Catch permissions errors related to opening a known_hosts file
11 years ago
James Cammarata e2d86e4f43 Splitting SETUP_CACHE into two caches, one for host vars and one for setup facts 11 years ago
James Cammarata a4df906fc9 Fixes to safe_eval 11 years ago
Tim G c307a73e28 Check for errors from adb, may not work on all systems. 11 years ago
Tim G 285d4f3fa6 If memory not available in syslog.log, catch error, attempt to find it with adb 11 years ago
Till Maas e6cb32f284 ssh connection plugin: Make comments more verbose
Explain _communicate() more.
11 years ago
Till Maas 1da69309e5 ssh connection plugin: Report missing sudo password
If no password is provided, sudo hangs at the prompt. Identify this and
report that the password is missing as an error.
11 years ago
Till Maas 2cae7472ad ssh: propagate prompt to _communicate()
_communicate() uses the prompt variable to detect wrong passwords early,
therefore it needs to be passed to it from exec_command().
11 years ago
James Cammarata 612a1a64f0 Apply extra vars after all other vars have been merged in a play
Fixes #6677
11 years ago
James Cammarata b9c044b8c9 Making the exception caught during os.dup of stdin explicit
Related to f23bb34
11 years ago
James Cammarata f23bb344aa Catch errors when duping stdin
Fixes #6657
11 years ago
James Cammarata 4f140be711 Merge branch 'devel' of https://github.com/Synforge/ansible into Synforge-devel 11 years ago
James Tanner efba8b4771 Merge branch 'regexreplace' of git://github.com/jacobweber/ansible into jacobweber-regexreplace 11 years ago
James Tanner 2492c2714a Fixes #5307 set relative paths to the files dir for roles and the inventory dir for non-role tasks 11 years ago
Till Maas b07113f358 ssh: Properly check for wrong su password 11 years ago
GuiGui2 b9613665dd Setup module: Additional facts when using ansible with Linux on System z
- Improved parsing of /proc/cpuinfo to take the specifics of Linux on
System z. ansible_processor and ansible_processor_cores are now
completed.
- Also improved virtualization facts in the same environment, parsing
the output of /usr/bin/lscpu to populate virtualization_type and
virtualization_role more precisely. If lscpu is not available, then
stick to the previous behavior.
11 years ago
James Cammarata b698f7a44b Add option to create host_key directory if it doesn't exist
Fixes #6731
11 years ago
Matt Martz 7e3dd1066c Allow raw and script to support su 11 years ago
Michael DeHaan a6b25e8657 Allow type=list module arguments to accept integers and floats. 11 years ago
Michael DeHaan 9921f804f9 Merge pull request #6643 from herbygillot/fact-full-hostname
Add a fact providing the full hostname, without the domain portion
11 years ago
Cristian Ciupitu 96ff1444f0 Micro-optimization: replace s.find(x)==0 with s.startswith(x)
timeit shows a speedup of ~1.4x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
11 years ago
Cristian Ciupitu 1eaf85b89f Micro-optimization: replace s.find(x)!=-1 with x in s
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
11 years ago
Paul Oyston 1942a69ed2 Added template call to _executor_internal to allow the passing of arbitrary data to modules. 11 years ago
Jesse Keating 3315ba0b99 Treat 255 errors from raw as dark host
Any other module is able to detect a dark host, but raw was treating 255
as a return code from the module execution, rather from the connection
attempt. This change allows 255 to be treated as a connection failure
when using the raw module.
11 years ago
James Cammarata 78bdb078fe Fix for bug related to async jid polling change plus a new test 11 years ago
James Tanner 88462729aa Addresses #6708 fill in missing keywords for ssh.py _communicate 11 years ago
jctanner 7dc3dc5279 Merge pull request #6708 from sivel/put-file-control-master
Share p.communicate alternative logic between exec_command and put_file
11 years ago
James Cammarata e09313120c Make async jid's unique per host
The jid will now also contain the PID of the async_wrapper process,
and can each unique jid from each host is tracked rather than just
relying on one global jid per task.

Fixes #5582
11 years ago
James Tanner 38de8cc87e Addresses #6705 Only set the role_uuid inside the role vars 11 years ago
Matt Martz b8cb23d309 Share p.communicate alternative logic between exec_command and put_file 11 years ago
James Tanner 8991e403e8 Fixes #6705 Give each role a unique uuid and apply tags only to tasks matching the uuid 11 years ago
James Cammarata 9ede6f7f49 Convert gather_facts to a boolean value if it is not None
Fixes #5618
11 years ago
James Tanner 2a976ac313 Fixes #5059 Ignore lookup failures when templating a task name 11 years ago
Serge van Ginderachter b0ff1ea425 performance optimisation in hash merge logic
rewrite deepcopy in util.merge_hash and just iterate
on an inventory with 500 groups and 800 hosts this brings back the
inventory initialisation from 13s to 3s (with hash_behaviour=merge)
11 years ago
Serge van Ginderachter d4634983f0 Move group/host_vars parsing into core inventory
modified:   lib/ansible/inventory/__init__.py
	deleted:    lib/ansible/inventory/vars_plugins/group_vars.py
	modified:   lib/ansible/utils/__init__.py
11 years ago
James Cammarata 7a3fa63db5 Fix for unicode environment variable handling
Fixes #5395
11 years ago
Serge van Ginderachter f8ea93c732 Move inventory.set_playbook_basedir from ansible-playbook to playbook constructor 11 years ago
Serge van Ginderachter cc28fd891b Introduce noop vars plugin.
In preparation to move the group_vars plugin code into core.

	new file:   lib/ansible/inventory/vars_plugins/noop.py
11 years ago
Serge van Ginderachter f6a55a3552 Refactor vars_plugins (host/group_vars)
Split out parsing of vars files to per host and per group
parsing, instead of reparsing all groups for each host. This enhances
performance.

Extend vars_plugins' API with two new methods:
* get host variables: only parses host_vars
* get group variables: only parses group_vars for specific group
The initial run method is still used for backward compatibility.

Parse all vars_plugins at inventory initialisation, instead of
per host when touched first by runner. Here we can also loop through
all groups once easily, then parse them.
This also centralizes all parsing in the inventory constructor.

	modified:   bin/ansible
	modified:   bin/ansible-playbook
	modified:   lib/ansible/inventory/__init__.py
	modified:   lib/ansible/inventory/vars_plugins/group_vars.py
11 years ago
James Tanner 3194fbd365 Fixes #6655 catch unicode encoding errors before sending to syslog 11 years ago
jctanner 7b8d1c0ffd Merge pull request #6580 from ramondelafuente/fix-vault-editor-call
Changed call to EDITOR to allow for parameters
11 years ago
Ramon de la Fuente c79c001bfb Changed call to EDITOR to allow for parameters
The EDITOR environment variable is used to create and edit files in the vault.
But if the EDITOR variable contains parameters, subprocess.call() breaks.

This fixes the EDITOR environment variable to be safely split into a list.
It adds a dependency on shlex.
11 years ago
James Cammarata c9bf7eb9bb Don't run {failed|changed}_when checks until async_status is done
Fixes #5117
11 years ago
James Cammarata 4ea12c1b86 Make sure stat of dest is available in atomic_move
Fixes #6682
11 years ago
James Tanner f9018a6f1d Ensure handlers run when meta tasks are defined and add handler integration tests
Fixes #6678
Fixes #6670
11 years ago
Michael DeHaan 3eecc039b9 Merge pull request #6656 from Jmainguy/setup
Added ansible_date_time.weekday as a fact. This returns Monday,Tuesday,W...
11 years ago
James Cammarata 8c7828d469 Tweaking error message resulting from undefined template variables
Fixes #5114
11 years ago
James Cammarata 846933dd53 Make inventory parsing error detection smarter
If something is executable but doesn't look like it should be, or if
something is NOT executable and DOES looks like it should, show a
more apropos error with a hint on correcting the problem

Fixes #5113
11 years ago
Michael DeHaan a062912a1f Merge pull request #6658 from pilou-/fix_fix
'changed' key is not defined when task fails
11 years ago
Michael DeHaan 9be732d8f2 Merge pull request #6679 from renard/fix-simplejson-module
Fix TypeError when using old simplejson lib.
11 years ago
Herby Gillot 94297950a0 Name platform.node() fact as "nodename" 11 years ago
James Tanner ebd1f70c5d Typo in setting task_errors variable 11 years ago
Sébastien Gross ef6b437d0d Fix TypeError when using old simplejson lib.
On some very old simplejson does not support the 'encoding' and give
following exception:

   TypeError: __init__() got an unexpected keyword argument 'encoding'

This fix runs json.dump with no encoding key (such as before #a023cb) on
TypeError exception only.
11 years ago
Serge van Ginderachter d3eaa1b79e InventoryDir: refactor logic
Make sure all hosts and groups are unique objects
and that those are referenced uniquely everywhere.
Also fixes test_dir_inventory unit tests which were broken after previous
patches.

	modified:   lib/ansible/inventory/dir.py
11 years ago
Serge van Ginderachter 188375171e Inventory: raise error when adding a group that already exists.
The parsers check if a group already exists.
11 years ago
Serge van Ginderachter be58808fe4 inventory script parser: do not add all the groups to *all* group 11 years ago
Serge van Ginderachter 0ceefbbf29 inventory ini parser: do not add all the groups to *all* group
but only those with lowest depth, so we keep a proper tree structure
11 years ago
Serge van Ginderachter cc8efb4aab inventory groups: make sure group.depth is updated on all grandchildren 11 years ago
Serge van Ginderachter 1c86909875 inventory group: add groups to parent_groups only once 11 years ago
Serge van Ginderachter 36f55d3549 inventory directory parser: add host to group only once 11 years ago
Serge van Ginderachter 8b215149d4 inventory directory parser: add groups to parent_groups non-recursively 11 years ago
Serge van Ginderachter 262ba0460a inventory directory parser: add hosts to group non-recursively 11 years ago
James Tanner 605156c904 Fixes premature handler execution after adding force-handlers 11 years ago
James Cammarata bc93732b1d Catch permissions errors related to opening a known_hosts file in modules
Fixes #6644
11 years ago
James Cammarata dc658eaa1c Check to make sure the host is in the inventory vars cache before clearing it
Fixes #6660
11 years ago
James Cammarata db345391e3 Fixing ownership when atomic_move is creating a file while sudo'ing
Fixes #6647
11 years ago
Pierre-Louis Bonicoli c76501b8a3 'changed' key is not defined when task fails
fix KeyError introduced by fix of #6591.
11 years ago
Jonathan Mainguy b17b5ad85b Added ansible_date_time.weekday as a fact. This returns Monday,Tuesday,Wednesday,Thursday,Friday,Saturday, or Sunday depending on the remote servers time. Useful for backups the way I use it 11 years ago
James Cammarata bb723bedee Merge branch 'atomic_move_restore_owner_group_rebase' of https://github.com/tyll/ansible into tyll-atomic_move_restore_owner_group_rebase 11 years ago
James Tanner 9169a11088 Fixes #4777 add --force-handlers option to run handlers even if tasks fail 11 years ago
Herby Gillot c0886a5f3a Add a fact providing the full hostname, without the domain portion
truncated.
11 years ago
Michael DeHaan fba2f1f9a9 Merge pull request #6639 from fvieira/devel
Add missing sha1 import on known_hosts.py
11 years ago
Michael DeHaan a24d3f78d9 Merge pull request #6634 from pilou-/fix
Remove print statements
11 years ago
James Cammarata 31628d86a1 Adding in a configurable option for the accelerate daemon timeout
This was apparently an oversite, as it has never been configurable
despite having a module parameter for the timeout.
11 years ago
James Cammarata 3ea5d573aa Acclerate improvements
* Added capability to support multiple keys, so clients from different
  machines can connect to a single daemon instance
* Any activity on the daemon will cause the timeout to extend, so that the
  daemon must be idle for the full number of minutes before it will auto-
  shutdown
* Various other small fixes to remove some redundancy

Fixes #5171
11 years ago
Francisco José Marques Vieira e9d7476c28 Add missing sha1 import on known_hosts.py 11 years ago
Pierre-Louis Bonicoli d3a470db0c Remove print statements
"print item" raises an exception when type of item is
jinja2.runtime.StrictUndefined
11 years ago
James Tanner 5b3b9ba267 Addresses #4407 Caculate failed percentage based on serial and number of hosts in play 11 years ago
Michael DeHaan d0cbb51170 Merge pull request #6615 from 8191/devel
Addresses #6591 Hide diff for lineinfile if file did not change.
11 years ago
Manuel Faux b8158f5f6a Addresses #6591 Hide diff for lineinfile if file did not change. 11 years ago
Joshua Conner 1c504eff68 etcd lookup: use $ANSIBLE_ETCD_URL if it exists in the env 11 years ago
James Tanner 14499e8bf3 Fixes #4325 allow async and poll parameters to be templated vars 11 years ago
James Tanner ea5186ca63 Fixes #6590 add set_remote_user parameter to synchronize
This allows usage of custom ssh configs for remote hosts where
the inventory user does not match the configured user.
11 years ago
James Tanner 95c79ad483 Fixes #4239 merge injects with new vars loaded from files 11 years ago
James Tanner d327e3d11a Fixes #5622 included tasks in roles now inherit tags from the role 11 years ago
Till Maas 898a38b074 module_utils/atomic_move(): Use tempfile module
Fix a potential race condition by using the tempfile module.
11 years ago
Till Maas 8f778a83df module_utils/atomic_move(): Restore owner/group
Manually restore owner and group if both src and dest are on a separate
file system.
11 years ago
Michael DeHaan e639b5382b Change default gathering policy, add to docs. 11 years ago
Brian Coca 18adf07fc6 changed setting values and updated docs 11 years ago
Brian Coca 4dfa40f18e added gathering control to ansible, defaults to 'smart' 11 years ago
Michael DeHaan c42dbf80a2 Merge pull request #6586 from sivel/probline-logic-fix
Fix logic in process_common_errors for unbalanced quotes
11 years ago
James Tanner b8f627d1d5 Prevent rewriting the encrypted file if decryption fails 11 years ago
James Tanner e71857fbdf Addresses #6579 Only strip vault passwords if given 11 years ago
James Tanner 8c2e1e2baa Addresses #6579 Disallow vault passwords with newline characters by stripping them in utils 11 years ago
James Cammarata a9000e7f3a Making the error messages for bad key/dir permissions more understandable
Fixes #6254
11 years ago
Matt Martz 2aaecc5afa Fix logic in process_common_errors for unbalanced quotes 11 years ago
James Cammarata 4880cfb5ea Merge pull request #6568 from sivel/ssl-cert-validation-osx
Make SSL verification on Mac OS X work out of the box
11 years ago
James Tanner 67517e96d3 Fixes #6567 put the git wrapper script in the module temp dir 11 years ago
Matt Martz 1d3d73a0b6 Only write the DUMMY_CA_CERT on OS X 11 years ago
Matt Martz 3b5aa8bd30 Provide a dummy ca to allow OS X to do it's OpenSSL keychain magic 11 years ago
James Cammarata eb7717aa02 Make sure all tags are in a list before merging for role deps
Fixes #6557
11 years ago
James Cammarata c9fcbf7bdd Change print message to vvv for missing known hosts in ssh.py 11 years ago
James Tanner 49807877fa Fixes #6550 Use shell for pipe lookup subprocess.popen calls 11 years ago
James Cammarata 3f5440f7df Make modules set a valid working directory
Fixes #6546
11 years ago
James Cammarata 84908a57fc Don't filter role deps on tags
Also, fixed a bug where the tags were being merged into the wrong
data structure (passed_vars) in _build_role_dependencies()

Fixes #6439
Fixes #5709
11 years ago
Michael DeHaan 9da26da335 Merge branch 'ini_vars' of git://github.com/dmage/ansible into devel 11 years ago
Michael DeHaan 13f69dad05 Merge pull request #6527 from patrickheeney/hosts-bug
Fix for hostkey directory
11 years ago
Michael DeHaan 94e3350b38 Catch a unquoted line error. Fixes #6532 11 years ago
jctanner b8d5ba42f5 Merge pull request #6523 from sergevanginderachter/vault-in-subdirs
Pass through vault_password when parsing host/group vars as directories.
11 years ago
James Cammarata c4f1c3c6b0 Merge branch 'bcoca-file_fixes_clean' into devel 11 years ago
James Tanner ad70e9bcd6 Fixes #6227 skip non-unicode strings and catch decode errors silently in template_from_string 11 years ago
James Tanner 20262b6c15 Remove unused variable in _executor_internal 11 years ago
James Cammarata 5d8c9d3f0f Merge branch 'file_fixes_clean' of https://github.com/bcoca/ansible into bcoca-file_fixes_clean 11 years ago
James Cammarata 7edee91aba Fixing a bug in role tag handling where only the first tag was used
Fixes #6517
11 years ago
James Tanner ebb6b8442b Catch unicode unescape failures in copy action plugin 11 years ago
patrickheeney a9aab23f11 Fix for hostkey directory 11 years ago
James Tanner b14c658532 Fix concatenation for with_file 11 years ago
Serge van Ginderachter 280498a7e5 Pass through vault_password when parsing host/group vars as directories.
Fixes a bug where vault_password parameter was not passed through in
_load_vars_from_folder()

modified:   lib/ansible/inventory/vars_plugins/group_vars.py
11 years ago
Greg Dallavalle 77229553a3 fetch_url: Avoid credential stripping for FTP-scheme URLs 11 years ago
Michael DeHaan fe696e4720 Merge commit. 11 years ago
Michael DeHaan b41541c62a Merge conflict. 11 years ago
Michael DeHaan fd0ff6f174 Merge pull request #5711 from sivel/plugin-realpath
Use realpath for plugin directories instead of abspath
11 years ago
Michael DeHaan 6144c5e1e2 Merge pull request #5714 from eggsby/patch-2
Allow templates in ansible_sudo_pass inventory var
11 years ago
Michael DeHaan b0dbc61d63 Move facts to 'module_utils' so they can be referenced by other modules. Note unlike other module_utils/ dirs this keeps the original
license -- so usage of facts code in modules will be limited to GPLv3 modules.
11 years ago
Michael DeHaan b8f1e4f765 Merge pull request #6134 from veeti/include_with_items_path
Show the offending file name with the include + with_items error
11 years ago
Michael DeHaan 4a06954a13 Merge pull request #6390 from sergevanginderachter/group-varsdirs-svn
group_vars plugin: do not parse hidden files in subfolders
11 years ago
Michael DeHaan 9cdbc53741 Merge pull request #6420 from bcoca/role_names
added new role_names variable that exposes current roles list
11 years ago
Michael DeHaan 26efc7ace8 Revert "Populate module_setup from the setup module rather than special code elsewhere"
This reverts commit 58eec2e4c2.
11 years ago
Oleg Bulatov f6a4c20cc0 Make parsing variables for hosts and groups more consistent
This commit allows to specify arrays in [group:vars] block.

Signed-off-by: Oleg Bulatov <oleg@bulatov.me>
11 years ago
Michael DeHaan a9896afc66 Merge pull request #6418 from bcoca/template_itnore_errors
templates ignore_errors
11 years ago
Michael DeHaan d5856bd475 Merge pull request #6391 from sergevanginderachter/hashmerge_inventoryscripts
Allow hash_behaviour=merge to be respected in core inventory
11 years ago
Dag Wieers 58eec2e4c2 Populate module_setup from the setup module rather than special code elsewhere
This small change allows for individual setup actions to populate the SETUP_CACHE and not cause a subsequent facts-gathering when not needed. This follows the standard of other facts modules as laid out in #1206 and implemented in fedfd18774. It allows to test of the setup module has already been run even when gather_facts was explicitely disabled.
11 years ago
Michael DeHaan 3d44f7cd51 Merge pull request #6217 from ashokrajar/patch-1
pause plugin doesn't flush raw_input prompt
11 years ago
Cristian Ciupitu 0749112286 Micro-optimization: replace s.find(x)!=-1 with x in s
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
11 years ago
Cristian Ciupitu a7da5d8702 Micro-optimization of inventory.expand_hosts.detect_range 11 years ago
brdo 3963a64a4f Set keepalive to 5 seconds in paramiko_ssh.py
This update resolves https://github.com/ansible/ansible/issues/6476.
11 years ago
Brian Coca 2d25577e11 Fixes and cleanup to file functions and module
- unified set attribute functions ... not sure why 2 identical functions
exist with diff names, now there are 3 while i repoint all modules to 1
- fixed issue with symlinks being created w/o existing src when force=no
- refactored conditionals, simplified where possible
- added tests for symlink to nonexistant source, with both force options
- made symlink on existing attomic (force)
11 years ago
James Cammarata a0cb974575 Be sure to return to the old directory if cwd is set in run_command 11 years ago
James Tanner a348f67238 Reset the current directory after running subprocess.Popen 11 years ago
James Cammarata 677008bef7 Rejoin args list into a string for run_command when using an unsafe shell
This allows the use of an args list with leading environment variables,
which otherwise would fail due to the way Popen works.
11 years ago
James Cammarata 5233d4bc31 Fix typo in run_command when sending data that is not binary 11 years ago
James Cammarata b1a37dcc08 Revert "Rejoin args list into a string for run_command when using an unsafe shell"
This reverts commit 4273cb2d8e.
11 years ago
James Cammarata 4273cb2d8e Rejoin args list into a string for run_command when using an unsafe shell
This allows the use of an args list with leading environment variables,
which otherwise would fail due to the way Popen works.
11 years ago
Michael DeHaan d1753046e0 Revert "Correctly catch template errors without returning invalid data"
This reverts commit 3cd7d47b7e.
11 years ago
James Cammarata 303e085f8b Only use cwd in run_command kwargs if the directory exists 11 years ago
James Cammarata 60a7f57300 Make sure the cwd exists in run_command before trying to use it 11 years ago
Dan Koch bbf320fd22 Work around for cwd stat problems with run_command and sudo
This fixes issue #6443
11 years ago
James Cammarata 2c7d58abe0 Compile ca certs into a temp file to reduce number of attempts
For those who may have a large number of certs found, this can reduce
the number of ssl connections attempted.
11 years ago
Michael DeHaan d37f0c6d12 Use same implementation as ssh.py for "is in host file" checks in module code, prevents git module from adding keys more than once. 11 years ago
Michael DeHaan 6d841d120e Don't process shell commands as arrays. 11 years ago
James Cammarata 86d2ee4b97 Don't append tags from roles to the plays tags list
Fixes #6393
11 years ago
James Cammarata a9017af2bb Adding validate_certs to all modules that use fetch_url 11 years ago
Michael DeHaan cfabc2e28a module.run_command is intended to bypass the shell here, so can't do ">>" 11 years ago
James Cammarata 7f38cff989 Remove unused code from get_ca_certs() function 11 years ago
James Cammarata 804e4166c8 Rewriting ssl validation to try multiple certs found in paths
Previously, the function checked only for a single CA root cert, however
some distributions may have multiple certs in a directory. This will now
try any .crt or .pem file contained within several common paths for
each platform.

Fixes #6412
11 years ago
Michael DeHaan 0b0ca95731 Expand environment variables and tildes passed to commands generically across the board. 11 years ago
James Tanner 0e38f5dfdc Check for hash availability during vault operations 11 years ago
Brian Coca 906e59d8a8 added new role_names variable that exposes current roles list 11 years ago
Brian Coca 7778aca966 templates ignore_errors 11 years ago
James Cammarata 6c25e78299 Merge branch 'devel' of https://github.com/dparalen/ansible into dparalen-devel 11 years ago
James Tanner e4e64a9699 Rename lxc to libvirt_lxc 11 years ago
James Cammarata bca6adc812 Merge pull request #4064 from mscherer/lxc
Add a plugin that permit to use ansible for lxc system, using libvirt
11 years ago
James Cammarata 430cce9df3 Merge branch 'ec2_security_token' of https://github.com/willthames/ansible into willthames-ec2_security_token 11 years ago
Serge van Ginderachter 6b1cb22fc3 Allow hash_behaviour=merge to be respected in core inventory
(For now, this means, enable it also for inventory scripts)
11 years ago
Serge van Ginderachter 29c60bdaff group_vars plugin: do not parse hidden files in subfolders, e.g. avoid .svn/ 11 years ago
James Tanner 6740a1f342 Wrap crypto.hash imports with try/except 11 years ago
Michael DeHaan 411bcb7161 Merge remote branch 'real/devel' into devel 11 years ago
Michael DeHaan 2fa6110961 Update the message about pycrypto to include that python-devel must be installed. 11 years ago
James Tanner 0d6f6ad282 Implement new default cipher class AES256 11 years ago
Michael DeHaan 20f0157152 Merge pull request #6378 from franckcuny/headers-gce-utils
Add BSD license to module_utils/gce.py
11 years ago
James Tanner ba0fec4f42 Force command action to not be executed by the shell unless specifically enabled 11 years ago
James Cammarata 9730157525 Validate SSL certs accessed through urllib*
* Adds another module utility file which generalizes the
  access of urls via the urllib* libraries.
* Adds a new spec generator for common arguments.
* Makes the user-agent string configurable.

Fixes #6211
11 years ago
James Cammarata 6577ff5f85 Add tags from handlers to tag availability calculation 11 years ago
Richard Isaacson 4993cb57f4 Merge pull request #6283 from magicrobotmonkey/upstream
fix missing stdin in _parallel_runner

Tested with GIST https://gist.github.com/risaacson/7290d30a612e0c70ea1b.
Passes "make tests"
Passes non_destructive tests.
11 years ago
Franck Cuny 82f99bfa3d Add BSD license to module_utils/gce.py 11 years ago
Matt Martz 4b400ca5e9 Only used stripped data for testing if the file is json, but used unstripped when actually parsing. Fixes #6348 11 years ago
Seth Woodworth 1d5db30067 Updates loop warning, removes unnecessary c 11 years ago
James Cammarata 04a6dc6d12 Check for skipped tags in passed role variables before adding to them
Fixes #6330
11 years ago
Michael DeHaan d2cb35f898 Merge pull request #6320 from angstwad/instance-redo
Use isinstance() rather than a check using type()
11 years ago
James Cammarata 4753804ab4 Merge pull request #6332 from jimi-c/issue_6329_space_in_var
Correctly catch template errors without returning invalid data
11 years ago
James Cammarata e3b887f770 Fix range issue in inventory and add additional error checking
Fixes #6331
11 years ago
James Cammarata 3cd7d47b7e Correctly catch template errors without returning invalid data
Fixes #6329
11 years ago
James Cammarata f80d02d841 Properly wrap logical elements together for su/sudo detection 11 years ago
James Cammarata b6056044b7 Partial revert of 73c883c due to issues with handlers in roles
Fixes #6322
11 years ago
Michael DeHaan e486dbab04 Use the loaded variable since we have it assigned, not just for error detection. 11 years ago