From 5a254e6303b82f8fe73e6ab7b1579ac0c8e36e14 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 30 Jun 2015 16:22:50 -0500 Subject: [PATCH 1/5] Replace tabbed indentation with spaces for mysql_db module --- database/mysql/mysql_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/mysql/mysql_db.py b/database/mysql/mysql_db.py index e9a530811d4..c018ad143db 100644 --- a/database/mysql/mysql_db.py +++ b/database/mysql/mysql_db.py @@ -326,7 +326,7 @@ def main(): if state in ['dump','import']: if target is None: module.fail_json(msg="with state=%s target is required" % (state)) - if db == 'all': + if db == 'all': connect_to_db = 'mysql' db = 'mysql' all_databases = True From 9eb4219f79446c2302e346f6e4464ea2ead8626e Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 30 Jun 2015 16:23:28 -0500 Subject: [PATCH 2/5] Replaced tabbed indentation with spaces for apt module --- packaging/os/apt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/os/apt.py b/packaging/os/apt.py index 09129a73fa5..9172c69763d 100644 --- a/packaging/os/apt.py +++ b/packaging/os/apt.py @@ -230,10 +230,10 @@ def package_status(m, pkgname, version, cache, state): try: provided_packages = cache.get_providing_packages(pkgname) if provided_packages: - is_installed = False + is_installed = False # when virtual package providing only one package, look up status of target package if cache.is_virtual_package(pkgname) and len(provided_packages) == 1: - package = provided_packages[0] + package = provided_packages[0] installed, upgradable, has_files = package_status(m, package.name, version, cache, state='install') if installed: is_installed = True From 4f43c4c09cf717b2cb0b59041f3e2da21cedf1a9 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 30 Jun 2015 16:23:51 -0500 Subject: [PATCH 3/5] Replaced tabbed indentation with spaces for subversion module --- source_control/subversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source_control/subversion.py b/source_control/subversion.py index e3ff6dbfba5..cae4702e174 100644 --- a/source_control/subversion.py +++ b/source_control/subversion.py @@ -121,7 +121,7 @@ class Subversion(object): def checkout(self): '''Creates new svn working directory if it does not already exist.''' self._exec(["checkout", "-r", self.revision, self.repo, self.dest]) - + def export(self, force=False): '''Export svn repo to directory''' cmd = ["export"] From b6b576abf6c2e73c8fd4a5308c0cfff00f6d300d Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 30 Jun 2015 16:24:01 -0500 Subject: [PATCH 4/5] Replaced tabbed indentation with spaces for group module --- system/group.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/group.py b/system/group.py index d952cb5c28c..53ab5f904dc 100644 --- a/system/group.py +++ b/system/group.py @@ -121,7 +121,7 @@ class Group(object): if len(cmd) == 1: return (None, '', '') if self.module.check_mode: - return (0, '', '') + return (0, '', '') cmd.append(self.name) return self.execute_command(cmd) From c2d0fbd45ba882c8a211f645e22e029d8c0b8b2a Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 30 Jun 2015 16:24:23 -0500 Subject: [PATCH 5/5] Remove unnecessary imports in a docs only file for win_copy --- windows/win_copy.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/windows/win_copy.py b/windows/win_copy.py index efdebc5a4a6..acc6c9ef2e0 100644 --- a/windows/win_copy.py +++ b/windows/win_copy.py @@ -18,8 +18,6 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . -import os -import time DOCUMENTATION = ''' ---