From 17fa8e3c84d3e2eb1e4839c938f58bd7dd452089 Mon Sep 17 00:00:00 2001 From: Jonathan Mainguy Date: Mon, 31 Mar 2014 11:09:00 -0400 Subject: [PATCH] Added mpdehaan suggestion to use os.path.splitext. Wise suggestion, does look clearner --- database/mysql_db | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/database/mysql_db b/database/mysql_db index aa852ea78c1..97655fbc006 100644 --- a/database/mysql_db +++ b/database/mysql_db @@ -153,13 +153,13 @@ def db_import(module, host, user, password, db_name, target, port, socket=None): rc, stdout, stderr = module.run_command('%s %s' % (gunzip_path, target)) if rc != 0: return rc, stdout, stderr - cmd += " < %s" % pipes.quote(target[0:-3]) + cmd += " < %s" % pipes.quote(os.path.splitext(target)[0]) rc, stdout, stderr = module.run_command(cmd, use_unsafe_shell=True) if rc != 0: return rc, stdout, stderr gzip_path = module.get_bin_path('gzip') if gzip_path: - rc, stdout, stderr = module.run_command('%s %s' % (gzip_path, target[0:-3])) + rc, stdout, stderr = module.run_command('%s %s' % (gzip_path, os.path.splitext(target)[0])) else: module.fail_json(msg="gzip command not found") else: @@ -170,13 +170,13 @@ def db_import(module, host, user, password, db_name, target, port, socket=None): rc, stdout, stderr = module.run_command('%s %s' % (bunzip2_path, target)) if rc != 0: return rc, stdout, stderr - cmd += " < %s" % pipes.quote(target[0:-4]) + cmd += " < %s" % pipes.quote(os.path.splitext(target)[0]) rc, stdout, stderr = module.run_command(cmd, use_unsafe_shell=True) if rc != 0: return rc, stdout, stderr bzip2_path = module.get_bin_path('bzip2') if bzip2_path: - rc, stdout, stderr = module.run_command('%s %s' % (bzip2_path, target[0:-4])) + rc, stdout, stderr = module.run_command('%s %s' % (bzip2_path, os.path.splitext(target)[0])) else: module.fail_json(msg="bzip2 command not found") else: